';
}
docById("noteInfo").innerHTML +=
- ' ' +
+ _("note") +
+ " " +
this.ratiosNotesPair[index][1] +
"(- " +
centsDiff1[index].toFixed(2) +
@@ -568,7 +365,9 @@ class TemperamentWidget {
"
";
} else {
docById("noteInfo").innerHTML +=
- ' Note : ' +
+ '
' +
+ _("note") +
+ " " +
this.ratiosNotesPair[index][1] +
"(+ " +
centsDiff1[index].toFixed(2) +
@@ -577,63 +376,58 @@ class TemperamentWidget {
}
}
docById("noteInfo").innerHTML +=
- '
Frequency : ' + + "
" + + _("frequency") + + '"; docById("noteInfo").innerHTML += - '
Done
Frequency : ' + frequency + "
";
+ ' ' + _("frequency") + " " + frequency + "
";
docById("noteInfo").style.top = "130px";
docById("noteInfo").style.left = "132px";
docById("noteInfo").style.position = "absolute";
docById("noteInfo").style.zIndex = 10;
-
- docById("close").style.cursor = "pointer";
-
- docById("close").onclick = () => {
+ docById("close").onclick = function () {
docById("noteInfo").remove();
};
if (docById("edit") !== null) {
- docById("edit").addEventListener("click", (e) => {
- this.editFrequency(e);
+ docById("edit").addEventListener("click", function (e) {
+ that.editFrequency(e);
});
}
}
}
};
- /**
- * Triggered when the user wants to edit frequency.
- * @param {Object} event
- * @returns {void}
- */
- editFrequency = (event) => {
+ this.editFrequency = function (event) {
const i = Number(event.target.dataset.message);
+ const that = this;
docById("noteInfo").style.width = "180px";
docById("noteInfo").style.height = "130px";
docById("note").innerHTML = "";
docById("frequency").innerHTML = "";
docById("noteInfo").innerHTML +=
- 'Frequency : ' + + "
" + + _("frequency") + + '"; docById("noteInfo").innerHTML += - '
';
+ '
' +
+ _("done") +
+ " 
';
+ '';
docById("noteInfo1").innerHTML +=
'
Done
";
- docById("frequencySlider1").oninput = () => {
+ docById("frequencySlider1").oninput = function () {
docById("frequencydiv1").innerHTML = docById("frequencySlider1").value;
const frequency = docById("frequencySlider1").value;
- const ratio = frequency / this.frequencies[0];
- // labels = [];
- // ratioDifference = [];
- this.temporaryRatios = this.ratios.slice();
- this.temporaryRatios[i] = ratio;
- logo.resetSynth(0);
- logo.synth.trigger(
+ const ratio = frequency / that.frequencies[0];
+ that.temporaryRatios = that.ratios.slice();
+ that.temporaryRatios[i] = ratio;
+ that._logo.resetSynth(0);
+ that._logo.synth.trigger(
0,
frequency,
Singer.defaultBPMFactor * 0.01,
@@ -641,36 +435,30 @@ class TemperamentWidget {
null,
null
);
- this.createMainWheel(this.temporaryRatios);
+ that.createMainWheel(that.temporaryRatios);
};
- docById("done").onclick = () => {
- this.ratios = this.temporaryRatios.slice();
- this.typeOfEdit = "nonequal";
- this.createMainWheel();
- const frequency1 = this.frequencies[0];
- this.frequencies = [];
- for (let j = 0; j < this.ratios.length; j++) {
- this.frequencies[j] = this.ratios[j] * frequency1;
- this.frequencies[j] = this.frequencies[j].toFixed(2);
+ docById("done").onclick = function () {
+ that.ratios = that.temporaryRatios.slice();
+ that.typeOfEdit = "nonequal";
+ that.createMainWheel();
+ const frequency1 = that.frequencies[0];
+ that.frequencies = [];
+ for (let j = 0; j < that.ratios.length; j++) {
+ that.frequencies[j] = that.ratios[j] * frequency1;
+ that.frequencies[j] = that.frequencies[j].toFixed(2);
}
- this.checkTemperament(this.ratios);
+ that.checkTemperament(that.ratios);
docById("noteInfo").remove();
};
-
- docById("close").onclick = () => {
- this.temporaryRatios = this.ratios.slice();
- this.createMainWheel();
+ docById("close").onclick = function () {
+ that.temporaryRatios = that.ratios.slice();
+ that.createMainWheel();
docById("noteInfo").remove();
};
};
- /**
- * Triggered when graph of notes UI element is stelected displays circular graph of all the
- * notes present.
- * @returns {void}
- */
- _graphOfNotes() {
+ this._graphOfNotes = function () {
this.circleIsVisible = true;
this.toggleNotesButton();
temperamentTableDiv.innerHTML = "";
@@ -681,13 +469,18 @@ class TemperamentWidget {
temperamentTableDiv.innerHTML = '
';
const notesGraph = docById("notesGraph");
- const headerNotes = notesGraph.createTHead();
- headerNotes.insertRow(0);
let menuLabels = [];
- if (isCustom(this.inTemperament)) {
- menuLabels = ["Play", "Pitch Number", "Ratio", "Frequency"];
+ if (isCustomTemperament(this.inTemperament)) {
+ menuLabels = [_("Play"), _("pitch number"), _("ratio"), _("frequency")];
} else {
- menuLabels = ["Play", "Pitch Number", "Ratio", "Interval", "Note", "Frequency"];
+ menuLabels = [
+ _("Play"),
+ _("pitch number"),
+ _("ratio"),
+ _("interval"),
+ _("note"),
+ _("frequency")
+ ];
menuLabels.splice(5, 0, this.scale);
}
notesGraph.innerHTML =
@@ -705,9 +498,8 @@ class TemperamentWidget {
menuItems[i].style.background = platformColor.labelColor;
menuItems[i].style.height = 30 + "px";
menuItems[i].style.textAlign = "center";
- menuItems[i].style.fontSize = "0.9rem";
menuItems[i].style.fontWeight = "bold";
- if (isCustom(this.inTemperament)) {
+ if (isCustomTemperament(this.inTemperament)) {
menuItems[0].style.width = 40 + "px";
menuItems[1].style.width = 120 + "px";
menuItems[2].style.width = 120 + "px";
@@ -731,55 +523,53 @@ class TemperamentWidget {
'
';
notesCell[(i, 0)].style.width = 40 + "px";
+ notesCell[(i, 0)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 0)].style.textAlign = "center";
- const img_wrap = document.createElement("div");
- img_wrap.style.height = "2.5rem";
- img_wrap.style.display = "grid";
- img_wrap.style.alignItems = "center";
- img_wrap.style.justifyContent = "center";
-
- const play_btn = document.createElement("img");
- play_btn.src = "header-icons/play-button.svg";
- play_btn.id = `play_${i}`;
- play_btn.style.height = "1.25rem";
- play_btn.style.width = "1.25rem";
- play_btn.style.transition = "all 0.25s ease";
- play_btn.onmouseover = (event) => {
- event.target.style.cursor = "pointer";
- event.target.style.transform = "scale(1.1)";
+ notesCell[(i, 0)].onmouseover = function () {
+ this.style.backgroundColor = platformColor.selectorBackgroundHOVER;
};
- play_btn.onmouseout = (event) => {
- event.target.style.transform = "scale(1)";
+
+ notesCell[(i, 0)].onmouseout = function () {
+ this.style.backgroundColor = platformColor.selectorBackground;
};
- play_btn.onclick = (event) => {
- this.playNote(event.target.id.split("_")[1]);
+
+ const playImage = docById("play_" + i);
+
+ // eslint-disable-next-line no-unused-vars
+ playImage.onmouseover = function (event) {
+ this.style.cursor = "pointer";
};
- img_wrap.appendChild(play_btn);
- notesCell[(i, 0)].appendChild(img_wrap);
+ playImage.onclick = function (event) {
+ that.playNote(event.target.dataset.id);
+ };
//Pitch Number
notesCell[(i, 1)] = notesRow[i].insertCell(-1);
notesCell[(i, 1)].id = "pitchNumber_" + i;
notesCell[(i, 1)].innerHTML = i;
+ notesCell[(i, 1)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 1)].style.textAlign = "center";
ratios[i] = this.ratios[i];
@@ -788,19 +578,22 @@ class TemperamentWidget {
//Ratio
notesCell[(i, 2)] = notesRow[i].insertCell(-1);
notesCell[(i, 2)].innerHTML = ratios[i];
+ notesCell[(i, 2)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 2)].style.textAlign = "center";
- if (!isCustom(this.inTemperament)) {
+ if (!isCustomTemperament(this.inTemperament)) {
//Interval
notesCell[(i, 3)] = notesRow[i].insertCell(-1);
notesCell[(i, 3)].innerHTML = this.intervals[i];
notesCell[(i, 3)].style.width = 120 + "px";
+ notesCell[(i, 3)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 3)].style.textAlign = "center";
//Notes
notesCell[(i, 4)] = notesRow[i].insertCell(-1);
- notesCell[(i, 4)].innerHTML = `${this.notes[i][0]}, ${this.notes[i][1]}`;
+ notesCell[(i, 4)].innerHTML = this.notes[i];
notesCell[(i, 4)].style.width = 50 + "px";
+ notesCell[(i, 4)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 4)].style.textAlign = "center";
//Mode
@@ -812,18 +605,20 @@ class TemperamentWidget {
}
}
if (notesCell[(i, 5)].innerHTML === "") {
- notesCell[(i, 5)].innerHTML = "Non Scalar";
+ notesCell[(i, 5)].innerHTML = _("non scalar");
}
notesCell[(i, 5)].style.width = 100 + "px";
+ notesCell[(i, 5)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 5)].style.textAlign = "center";
}
//Frequency
notesCell[(i, 6)] = notesRow[i].insertCell(-1);
notesCell[(i, 6)].innerHTML = this.frequencies[i];
+ notesCell[(i, 6)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 6)].style.textAlign = "center";
- if (isCustom(this.inTemperament)) {
+ if (isCustomTemperament(this.inTemperament)) {
notesCell[(i, 1)].style.width = 130 + "px";
notesCell[(i, 6)].style.width = 130 + "px";
notesCell[(i, 2)].style.width = 130 + "px";
@@ -833,17 +628,13 @@ class TemperamentWidget {
notesCell[(i, 2)].style.width = 60 + "px";
}
}
- }
+ };
- /**
- * Triggerred when any one of the UI edit elemnts is selected.
- * @returns {void}
- */
- edit() {
+ this.edit = function () {
this.editMode = null;
- logo.synth.setMasterVolume(0);
- logo.synth.stop();
-
+ this._logo.synth.setMasterVolume(0);
+ this._logo.synth.stop();
+ const that = this;
if (docById("wheelDiv2") != null) {
docById("wheelDiv2").style.display = "none";
this.notesCircle.removeWheel();
@@ -851,9 +642,9 @@ class TemperamentWidget {
temperamentTableDiv.innerHTML = "";
temperamentTableDiv.innerHTML =
'
';
- const editMenus = ["Equal", "Ratios", "Arbitrary", "Octave Space"];
+ const editMenus = [_("equal"), _("ratios"), _("arbitrary"), _("octave space")];
let menus = "";
for (let i = 0; i < editMenus.length; i++) {
@@ -865,93 +656,95 @@ class TemperamentWidget {
const menuItems = document.querySelectorAll("#editMenus");
for (let i = 0; i < editMenus.length; i++) {
menuItems[i].style.background = platformColor.selectorBackground;
- menuItems[i].style.height = 40 + "px";
+ menuItems[i].style.height = 30 + "px";
menuItems[i].style.textAlign = "center";
- menuItems[i].style.cursor = "pointer";
menuItems[i].style.fontWeight = "bold";
- menuItems[i].style.paddingRight = "5px";
}
- menuItems[0].style.background = "#FFFFFF";
- this.equalEdit();
+ menuItems[0].style.background = "#c8C8C8";
+ that.equalEdit();
- for (let i = 0; i < 4; i++) {
- menuItems[i].onmouseover = () => {
- menuItems[i].style.backgroundColor = "#7bb5ee";
- };
- }
+ // eslint-disable-next-line no-unused-vars
+ menuItems[0].onclick = function (event) {
+ menuItems[1].style.background = platformColor.selectorBackground;
+ menuItems[2].style.background = platformColor.selectorBackground;
+ menuItems[3].style.background = platformColor.selectorBackground;
+ menuItems[0].style.background = "#c8C8C8";
+ that.equalEdit();
+ };
- for (let i = 0; i < 4; i++) {
- menuItems[i].onmouseout = () => {
- if (
- (i == 0 && this.editMode != "equal") ||
- (i == 1 && this.editMode != "ratio") ||
- (i == 2 && this.editMode != "arbitrary") ||
- (i == 3 && this.editMode != "octave")
- ) {
- menuItems[i].style.backgroundColor = "#8cc6ff";
- }
- };
- }
+ // eslint-disable-next-line no-unused-vars
+ menuItems[1].onclick = function (event) {
+ menuItems[0].style.background = platformColor.selectorBackground;
+ menuItems[2].style.background = platformColor.selectorBackground;
+ menuItems[3].style.background = platformColor.selectorBackground;
+ menuItems[1].style.background = "#c8C8C8";
+ that.ratioEdit();
+ };
- for (let i = 0; i < 4; i++) {
- menuItems[i].onclick = () => {
- for (let j = 0; j < 4; j++) {
- if (i != j) {
- menuItems[j].style.background = platformColor.selectorBackground;
- } else {
- menuItems[i].style.background = "#FFFFFF";
- }
- }
- if (i == 0) {
- this.equalEdit();
- } else if (i == 1) {
- this.ratioEdit();
- } else if (i == 2) {
- this.arbitraryEdit();
- } else {
- this.octaveSpaceEdit();
- }
- };
- }
- }
+ // eslint-disable-next-line no-unused-vars
+ menuItems[2].onclick = function (event) {
+ menuItems[0].style.background = platformColor.selectorBackground;
+ menuItems[1].style.background = platformColor.selectorBackground;
+ menuItems[3].style.background = platformColor.selectorBackground;
+ menuItems[2].style.background = "#c8C8C8";
+ that.arbitraryEdit();
+ };
- /**
- * Triggerred when the Equal edit option is selected.
- * @returns {void}
- */
- equalEdit() {
+ // eslint-disable-next-line no-unused-vars
+ menuItems[3].onclick = function (event) {
+ menuItems[0].style.background = platformColor.selectorBackground;
+ menuItems[1].style.background = platformColor.selectorBackground;
+ menuItems[2].style.background = platformColor.selectorBackground;
+ menuItems[3].style.background = "#c8C8C8";
+ that.octaveSpaceEdit();
+ };
+ };
+
+ this.equalEdit = function () {
this.editMode = "equal";
docById("userEdit").innerHTML = "";
const equalEdit = docById("userEdit");
- equalEdit.style.backgroundColor = "#FFFFFF";
+ equalEdit.style.backgroundColor = "#c8C8C8";
equalEdit.innerHTML =
- '
Pitch Number To
'; + "
" + + _("pitch number") + + ' ' + + _("to") + + '
'; equalEdit.innerHTML += - 'Number of Divisions '; equalEdit.style.paddingLeft = "80px"; + const that = this; + + const divAppend = document.createElement("div"); - let divAppend; - const addDivision = (preview) => { + function addDivision(preview) { // Add Buttons - divAppend = document.createElement("div"); divAppend.id = "divAppend"; if (preview) { divAppend.innerHTML = - '
Ratio :
'; + "
" + + _("ratio") + + ' :
'; ratioEdit.innerHTML += - 'Recursion '; + _("recursion") + + ' '; ratioEdit.style.paddingLeft = "100px"; + const that = this; + + const divAppend = document.createElement("div"); - let divAppend; - const addButtons = (preview) => { - divAppend = document.createElement("div"); + function addButtons(preview) { divAppend.id = "divAppend"; if (preview) { divAppend.innerHTML = - '
'; arbitraryEdit.style.paddingLeft = "0px"; - arbitraryEdit.style.backgroundColor = "#FFFFFF"; + + const that = this; const radius = 128; const height = 2 * radius; let angle1 = []; this.tempRatios1 = this.ratios.slice(); - this._createInnerWheel = (ratios, pitchNumber) => { + this._createInnerWheel = function (ratios, pitchNumber) { if (this.wheel1 !== undefined) { docById("wheelDiv4").display = "none"; this.wheel1.removeWheel(); @@ -1317,17 +1112,13 @@ class TemperamentWidget { pitchNumber = this.pitchNumber; } const labels = []; - let label; for (let j = 0; j < pitchNumber; j++) { - label = j.toString(); - labels.push(label); + labels.push(j.toString()); } docById("wheelDiv4").style.display = ""; docById("wheelDiv4").style.background = "none"; docById("wheelDiv4").style.position = "relative"; docById("wheelDiv4").style.zIndex = 5; - docById("wheelDiv4").style.marginTop = "13.5px"; - docById("wheelDiv4").style.marginLeft = "37.5px"; this.wheel1 = new wheelnav("wheelDiv4"); this.wheel1.wheelRadius = 200; this.wheel1.navItemsEnabled = false; @@ -1345,7 +1136,7 @@ class TemperamentWidget { const angle = []; const angleDiff = []; for (let i = 0; i < this.wheel1.navItemCount; i++) { - this.wheel1.navItems[i].fillAttr = TemperamentWidget.LIGHTGREY; + this.wheel1.navItems[i].fillAttr = "#e0e0e0"; this.wheel1.navItems[i].titleAttr.font = "20 20px Impact, Charcoal, sans-serif"; this.wheel1.navItems[i].titleSelectedAttr.font = "20 20px Impact, Charcoal, sans-serif"; @@ -1378,7 +1169,7 @@ class TemperamentWidget { this.wheel1.slicePathCustom.menuRadius = menuRadius; if (docById("frequencySlider") !== null) { - docById("frequencySlider").oninput = () => { + docById("frequencySlider").oninput = function () { this._refreshInnerWheel(); }; } @@ -1389,7 +1180,7 @@ class TemperamentWidget { arbitraryEdit.innerHTML += '
';
+ ' ';
notesCell[(i, 0)].style.width = 40 + "px";
+ notesCell[(i, 0)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 0)].style.textAlign = "center";
- const img_wrap = document.createElement("div");
- img_wrap.style.height = "2.5rem";
- img_wrap.style.display = "grid";
- img_wrap.style.alignItems = "center";
- img_wrap.style.justifyContent = "center";
-
- const play_btn = document.createElement("img");
- play_btn.src = "header-icons/play-button.svg";
- play_btn.id = `play_${i}`;
- play_btn.style.height = "1.25rem";
- play_btn.style.width = "1.25rem";
- play_btn.style.transition = "all 0.25s ease";
- play_btn.onmouseover = (event) => {
- event.target.style.cursor = "pointer";
- event.target.style.transform = "scale(1.1)";
+ notesCell[(i, 0)].onmouseover = function () {
+ this.style.backgroundColor = platformColor.selectorBackgroundHOVER;
};
- play_btn.onmouseout = (event) => {
- event.target.style.transform = "scale(1)";
+
+ notesCell[(i, 0)].onmouseout = function () {
+ this.style.backgroundColor = platformColor.selectorBackground;
};
- play_btn.onclick = (event) => {
- this.playNote(event.target.id.split("_")[1]);
+
+ const playImage = docById("play_" + i);
+
+ // eslint-disable-next-line no-unused-vars
+ playImage.onmouseover = function (event) {
+ this.style.cursor = "pointer";
};
- img_wrap.appendChild(play_btn);
- notesCell[(i, 0)].appendChild(img_wrap);
+ playImage.onclick = function (event) {
+ that.playNote(event.target.dataset.id);
+ };
//Pitch Number
notesCell[(i, 1)] = notesRow[i].insertCell(-1);
notesCell[(i, 1)].id = "pitchNumber_" + i;
notesCell[(i, 1)].innerHTML = i;
+ notesCell[(i, 1)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 1)].style.textAlign = "center";
ratios[i] = this.ratios[i];
@@ -788,19 +578,22 @@ class TemperamentWidget {
//Ratio
notesCell[(i, 2)] = notesRow[i].insertCell(-1);
notesCell[(i, 2)].innerHTML = ratios[i];
+ notesCell[(i, 2)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 2)].style.textAlign = "center";
- if (!isCustom(this.inTemperament)) {
+ if (!isCustomTemperament(this.inTemperament)) {
//Interval
notesCell[(i, 3)] = notesRow[i].insertCell(-1);
notesCell[(i, 3)].innerHTML = this.intervals[i];
notesCell[(i, 3)].style.width = 120 + "px";
+ notesCell[(i, 3)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 3)].style.textAlign = "center";
//Notes
notesCell[(i, 4)] = notesRow[i].insertCell(-1);
- notesCell[(i, 4)].innerHTML = `${this.notes[i][0]}, ${this.notes[i][1]}`;
+ notesCell[(i, 4)].innerHTML = this.notes[i];
notesCell[(i, 4)].style.width = 50 + "px";
+ notesCell[(i, 4)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 4)].style.textAlign = "center";
//Mode
@@ -812,18 +605,20 @@ class TemperamentWidget {
}
}
if (notesCell[(i, 5)].innerHTML === "") {
- notesCell[(i, 5)].innerHTML = "Non Scalar";
+ notesCell[(i, 5)].innerHTML = _("non scalar");
}
notesCell[(i, 5)].style.width = 100 + "px";
+ notesCell[(i, 5)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 5)].style.textAlign = "center";
}
//Frequency
notesCell[(i, 6)] = notesRow[i].insertCell(-1);
notesCell[(i, 6)].innerHTML = this.frequencies[i];
+ notesCell[(i, 6)].style.backgroundColor = platformColor.selectorBackground;
notesCell[(i, 6)].style.textAlign = "center";
- if (isCustom(this.inTemperament)) {
+ if (isCustomTemperament(this.inTemperament)) {
notesCell[(i, 1)].style.width = 130 + "px";
notesCell[(i, 6)].style.width = 130 + "px";
notesCell[(i, 2)].style.width = 130 + "px";
@@ -833,17 +628,13 @@ class TemperamentWidget {
notesCell[(i, 2)].style.width = 60 + "px";
}
}
- }
+ };
- /**
- * Triggerred when any one of the UI edit elemnts is selected.
- * @returns {void}
- */
- edit() {
+ this.edit = function () {
this.editMode = null;
- logo.synth.setMasterVolume(0);
- logo.synth.stop();
-
+ this._logo.synth.setMasterVolume(0);
+ this._logo.synth.stop();
+ const that = this;
if (docById("wheelDiv2") != null) {
docById("wheelDiv2").style.display = "none";
this.notesCircle.removeWheel();
@@ -851,9 +642,9 @@ class TemperamentWidget {
temperamentTableDiv.innerHTML = "";
temperamentTableDiv.innerHTML =
'Pitch Number To
'; + "
" + + _("pitch number") + + ' ' + + _("to") + + '
'; equalEdit.innerHTML += - 'Number of Divisions '; equalEdit.style.paddingLeft = "80px"; + const that = this; + + const divAppend = document.createElement("div"); - let divAppend; - const addDivision = (preview) => { + function addDivision(preview) { // Add Buttons - divAppend = document.createElement("div"); divAppend.id = "divAppend"; if (preview) { divAppend.innerHTML = - '
Back
Done
';
+ '' +
+ _("back") +
+ '
' +
+ _("done") +
+ "
";
} else {
divAppend.innerHTML =
- 'Preview
Done
';
+ '' +
+ _("preview") +
+ '
' +
+ _("done") +
+ "
";
}
divAppend.style.textAlign = "center";
divAppend.style.marginLeft = "-80px";
divAppend.style.height = "32px";
divAppend.style.marginTop = "40px";
divAppend.style.overflow = "auto";
- divAppend.style.cursor = "32px";
- divAppend.style.cursor = "pointer";
equalEdit.append(divAppend);
const divAppend1 = docById("preview");
@@ -959,20 +752,20 @@ class TemperamentWidget {
divAppend1.style.marginLeft = "3px";
divAppend1.style.backgroundColor = platformColor.selectorBackground;
divAppend1.style.width = "215px";
- divAppend1.style.lineHeight = "30px";
- divAppend1.style.cursor = "pointer";
const divAppend2 = docById("done_");
divAppend2.style.height = "30px";
divAppend2.style.marginRight = "3px";
divAppend2.style.backgroundColor = platformColor.selectorBackground;
divAppend2.style.width = "205px";
- divAppend2.style.lineHeight = "30px";
- divAppend2.style.cursor = "pointer";
- };
+ }
addDivision(false);
+ divAppend.onmouseover = function () {
+ this.style.cursor = "pointer";
+ };
+
let pitchNumber = this.pitchNumber;
let pitchNumber1 = Number(docById("octaveIn").value);
let pitchNumber2 = Number(docById("octaveOut").value);
@@ -982,12 +775,14 @@ class TemperamentWidget {
const ratio1 = [];
const ratio2 = [];
const ratio3 = [];
- let ratio4;
const index = [];
this.tempRatios = [];
- divAppend.addEventListener("click", (event) => {
- let angle1, angle2, divisionAngle, power, frequency;
+ divAppend.addEventListener("click", function (event) {
+ that.performEqualEdit(event);
+ });
+
+ this.performEqualEdit = function (event) {
pitchNumber1 = Number(docById("octaveIn").value);
pitchNumber2 = Number(docById("octaveOut").value);
divisions = Number(docById("divisions").value);
@@ -1001,7 +796,7 @@ class TemperamentWidget {
ratio2[i] = this.tempRatios[i];
ratio2[i] = ratio2[i].toFixed(2);
}
- ratio4 = ratio1.filter((val) => {
+ const ratio4 = ratio1.filter(function (val) {
return ratio2.indexOf(val) == -1;
});
@@ -1011,7 +806,7 @@ class TemperamentWidget {
}
this.tempRatios = this.tempRatios.concat(ratio3);
- this.tempRatios.sort((a, b) => {
+ this.tempRatios.sort(function (a, b) {
return a - b;
});
pitchNumber = this.tempRatios.length - 1;
@@ -1020,16 +815,16 @@ class TemperamentWidget {
} else {
pitchNumber =
divisions + Number(pitchNumber) - Math.abs(pitchNumber1 - pitchNumber2);
- angle1 =
+ const angle1 =
270 +
360 * (Math.log10(this.tempRatios[pitchNumber1]) / Math.log10(this.powerBase));
- angle2 =
+ const angle2 =
270 +
360 * (Math.log10(this.tempRatios[pitchNumber2]) / Math.log10(this.powerBase));
- divisionAngle = Math.abs(angle2 - angle1) / divisions;
+ const divisionAngle = Math.abs(angle2 - angle1) / divisions;
this.tempRatios.splice(pitchNumber1 + 1, Math.abs(pitchNumber1 - pitchNumber2) - 1);
for (let i = 0; i < divisions - 1; i++) {
- power = (Math.min(angle1, angle2) + divisionAngle * (i + 1) - 270) / 360;
+ const power = (Math.min(angle1, angle2) + divisionAngle * (i + 1) - 270) / 360;
ratio[i] = Math.pow(this.powerBase, power);
this.tempRatios.splice(pitchNumber1 + 1 + i, 0, ratio[i]);
compareRatios[i] = this.tempRatios[i];
@@ -1038,10 +833,10 @@ class TemperamentWidget {
this.typeOfEdit = "nonequal";
}
- if (event.target.innerHTML === "Done") {
- //Go to main Circle of Notes
+ if (event.target.innerHTML === "done") {
+ // Go to main "Circle of Notes"
this.ratios = this.tempRatios.slice();
- frequency = this.frequencies[0];
+ const frequency = this.frequencies[0];
this.frequencies = [];
for (let i = 0; i <= pitchNumber; i++) {
this.frequencies[i] = this.ratios[i] * frequency;
@@ -1056,11 +851,10 @@ class TemperamentWidget {
docById("userEdit").innerHTML = '';
this.createMainWheel(this.tempRatios, pitchNumber);
for (let i = 0; i < pitchNumber; i++) {
- this.notesCircle.navItems[i].fillAttr = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].sliceHoverAttr.fill = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].slicePathAttr.fill = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].sliceSelectedAttr.fill =
- TemperamentWidget.LIGHTGREY;
+ this.notesCircle.navItems[i].fillAttr = "#e0e0e0";
+ this.notesCircle.navItems[i].sliceHoverAttr.fill = "#e0e0e0";
+ this.notesCircle.navItems[i].slicePathAttr.fill = "#e0e0e0";
+ this.notesCircle.navItems[i].sliceSelectedAttr.fill = "#e0e0e0";
}
this.notesCircle.refreshWheel();
docById("userEdit").style.paddingLeft = "0px";
@@ -1069,243 +863,244 @@ class TemperamentWidget {
docById("preview").style.marginLeft = "80px";
//make temperary
- this.ratios = this.tempRatios.slice();
- frequency = this.frequencies[0];
+ const ratios = this.tempRatios.slice();
+ const frequency = this.frequencies[0];
this.eqTempHzs = [];
for (let i = 0; i <= pitchNumber; i++) {
- this.eqTempHzs[i] = this.ratios[i] * frequency;
+ this.eqTempHzs[i] = ratios[i] * frequency;
this.eqTempHzs[i] = this.eqTempHzs[i].toFixed(2);
}
this.eqTempPitchNumber = pitchNumber;
this.checkTemperament(compareRatios);
- docById("done_").onclick = () => {
+ docById("done_").onclick = function () {
//Go to main Circle of Notes
- this.ratios = this.tempRatios.slice();
- frequency = this.frequencies[0];
- this.frequencies = [];
+ that.ratios = that.tempRatios.slice();
+ const frequency = that.frequencies[0];
+ that.frequencies = [];
for (let i = 0; i <= pitchNumber; i++) {
- this.frequencies[i] = this.ratios[i] * frequency;
- this.frequencies[i] = this.frequencies[i].toFixed(2);
+ that.frequencies[i] = that.ratios[i] * frequency;
+ that.frequencies[i] = that.frequencies[i].toFixed(2);
}
- this.pitchNumber = pitchNumber;
- this.eqTempPitchNumber = null;
- this.eqTempHzs = [];
- this.checkTemperament(compareRatios);
- this._circleOfNotes();
+ that.pitchNumber = pitchNumber;
+ that.eqTempPitchNumber = null;
+ that.eqTempHzs = [];
+ that.checkTemperament(compareRatios);
+ that._circleOfNotes();
};
- docById("preview").onclick = () => {
- this.equalEdit();
- this.eqTempPitchNumber = null;
- this.eqTempHzs = [];
+ docById("preview").onclick = function () {
+ that.equalEdit();
+ that.eqTempPitchNumber = null;
+ that.eqTempHzs = [];
};
}
- });
- }
+ };
+ };
- /**
- * Triggerred when the Ratios edit option is selected.
- * @returns {void}
- */
- ratioEdit() {
+ this.ratioEdit = function () {
this.editMode = "ratio";
docById("userEdit").innerHTML = "";
const ratioEdit = docById("userEdit");
- ratioEdit.style.backgroundColor = "#FFFFFF";
+ ratioEdit.style.backgroundColor = "#c8C8C8";
ratioEdit.innerHTML =
- 'Ratio :
'; + "
" + + _("ratio") + + ' :
'; ratioEdit.innerHTML += - 'Recursion '; + _("recursion") + + ' '; ratioEdit.style.paddingLeft = "100px"; + const that = this; + + const divAppend = document.createElement("div"); - let divAppend; - const addButtons = (preview) => { - divAppend = document.createElement("div"); + function addButtons(preview) { divAppend.id = "divAppend"; if (preview) { divAppend.innerHTML = - '
Back
Done
';
+ '' +
+ _("back") +
+ '
' +
+ _("done") +
+ "
";
} else {
divAppend.innerHTML =
- 'Preview
Done
';
+ '' +
+ _("preview") +
+ '
' +
+ _("done") +
+ "
";
}
divAppend.style.textAlign = "center";
divAppend.style.marginLeft = "-100px";
divAppend.style.height = "32px";
divAppend.style.marginTop = "40px";
divAppend.style.overflow = "auto";
- divAppend.style.lineHeight = "32px";
- divAppend.style.cursor = "pointer";
ratioEdit.append(divAppend);
const divAppend1 = docById("preview");
divAppend1.style.height = "30px";
divAppend1.style.marginLeft = "3px";
divAppend1.style.backgroundColor = platformColor.selectorBackground;
- divAppend1.style.cursor = "pointer";
- divAppend1.style.lineHeight = "30px";
divAppend1.style.width = "215px";
const divAppend2 = docById("done_");
divAppend2.style.height = "30px";
divAppend2.style.marginRight = "3px";
divAppend2.style.backgroundColor = platformColor.selectorBackground;
- divAppend2.style.cursor = "pointer";
- divAppend2.style.lineHeight = "30px";
divAppend2.style.width = "205px";
- };
+ }
addButtons(false);
- divAppend.onclick = (event) => {
+ divAppend.onmouseover = function () {
+ this.style.cursor = "pointer";
+ };
+
+ divAppend.onclick = function (event) {
const input1 = docById("ratioIn").value;
const input2 = docById("ratioOut").value;
const recursion = docById("recursion").value;
- const len = this.frequencies.length;
+ const len = that.frequencies.length;
const ratio1 = input1 / input2;
const ratio = [];
const frequency = [];
- let frequency1;
const ratioDifference = [];
const index = [];
const compareRatios = [];
- this.tempRatios = this.ratios.slice();
+ that.tempRatios = that.ratios.slice();
- const calculateRatios = (i) => {
- if (frequency[i] < this.frequencies[len - 1]) {
- for (let j = 0; j < this.tempRatios.length; j++) {
- ratioDifference[j] = ratio[i] - this.tempRatios[j];
+ const calculateRatios = function (i) {
+ if (frequency[i] < that.frequencies[len - 1]) {
+ for (let j = 0; j < that.tempRatios.length; j++) {
+ ratioDifference[j] = ratio[i] - that.tempRatios[j];
if (ratioDifference[j] < 0) {
index.push(j);
- this.tempRatios.splice(index[i], 0, ratio[i]);
+ that.tempRatios.splice(index[i], 0, ratio[i]);
break;
}
if (ratioDifference[j] == 0) {
index.push(j);
- this.tempRatios.splice(index[i], 1, ratio[i]);
+ that.tempRatios.splice(index[i], 1, ratio[i]);
break;
}
}
} else {
ratio[i] = ratio[i] / 2;
- frequency[i] = this.frequencies[0] * ratio[i];
+ frequency[i] = that.frequencies[0] * ratio[i];
calculateRatios(i);
}
};
for (let i = 0; i < recursion; i++) {
ratio[i] = Math.pow(ratio1, i + 1);
- frequency[i] = this.frequencies[0] * ratio[i];
+ frequency[i] = that.frequencies[0] * ratio[i];
calculateRatios(i);
}
- this.tempRatios.sort((a, b) => {
+ that.tempRatios.sort(function (a, b) {
return a - b;
});
- const pitchNumber = this.tempRatios.length - 1;
-
- if (event.target.innerHTML == "Done") {
- this.ratios = this.tempRatios.slice();
- this.typeOfEdit = "nonequal";
- this.pitchNumber = this.ratios.length - 1;
- frequency1 = this.frequencies[0];
- this.frequencies = [];
- for (let i = 0; i <= this.pitchNumber; i++) {
- this.frequencies[i] = this.ratios[i] * frequency1;
- this.frequencies[i] = this.frequencies[i].toFixed(2);
+ const pitchNumber = that.tempRatios.length - 1;
+
+ if (event.target.innerHTML == "done") {
+ that.ratios = that.tempRatios.slice();
+ that.typeOfEdit = "nonequal";
+ that.pitchNumber = that.ratios.length - 1;
+ const frequency1 = that.frequencies[0];
+ that.frequencies = [];
+ for (let i = 0; i <= that.pitchNumber; i++) {
+ that.frequencies[i] = that.ratios[i] * frequency1;
+ that.frequencies[i] = that.frequencies[i].toFixed(2);
}
- for (let i = 0; i < this.ratios.length; i++) {
- compareRatios[i] = this.ratios[i];
+ for (let i = 0; i < that.ratios.length; i++) {
+ compareRatios[i] = that.ratios[i];
compareRatios[i] = compareRatios[i].toFixed(2);
}
- this.checkTemperament(compareRatios);
- this._circleOfNotes();
+ that.checkTemperament(compareRatios);
+ that._circleOfNotes();
} else if (event.target.innerHTML == "Preview") {
//Preview Notes
docById("userEdit").innerHTML = '';
- this.createMainWheel(this.tempRatios, pitchNumber);
+ that.createMainWheel(that.tempRatios, pitchNumber);
for (let i = 0; i < pitchNumber; i++) {
- this.notesCircle.navItems[i].fillAttr = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].sliceHoverAttr.fill = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].slicePathAttr.fill = TemperamentWidget.LIGHTGREY;
- this.notesCircle.navItems[i].sliceSelectedAttr.fill =
- TemperamentWidget.LIGHTGREY;
+ that.notesCircle.navItems[i].fillAttr = "#e0e0e0";
+ that.notesCircle.navItems[i].sliceHoverAttr.fill = "#e0e0e0";
+ that.notesCircle.navItems[i].slicePathAttr.fill = "#e0e0e0";
+ that.notesCircle.navItems[i].sliceSelectedAttr.fill = "#e0e0e0";
}
- this.notesCircle.refreshWheel();
+ that.notesCircle.refreshWheel();
docById("userEdit").style.paddingLeft = "0px";
addButtons(true);
divAppend.style.marginTop = docById("wheelDiv2").style.height;
docById("preview").style.marginLeft = "100px";
//make temperary
- this.ratios = this.tempRatios.slice();
- this.typeOfEdit = "nonequal";
- this.NEqTempPitchNumber = this.ratios.length - 1;
- frequency1 = this.frequencies[0];
- this.NEqTempHzs = [];
- for (let i = 0; i <= this.NEqTempPitchNumber; i++) {
- this.NEqTempHzs[i] = this.ratios[i] * frequency1;
- this.NEqTempHzs[i] = this.NEqTempHzs[i].toFixed(2);
+ const ratios = that.tempRatios.slice();
+ that.typeOfEdit = "nonequal";
+ that.NEqTempPitchNumber = ratios.length - 1;
+ const frequency1 = that.frequencies[0];
+ that.NEqTempHzs = [];
+ for (let i = 0; i <= that.NEqTempPitchNumber; i++) {
+ that.NEqTempHzs[i] = ratios[i] * frequency1;
+ that.NEqTempHzs[i] = that.NEqTempHzs[i].toFixed(2);
}
- for (let i = 0; i < this.ratios.length; i++) {
- compareRatios[i] = this.ratios[i];
+ for (let i = 0; i < ratios.length; i++) {
+ compareRatios[i] = ratios[i];
compareRatios[i] = compareRatios[i].toFixed(2);
}
- this.checkTemperament(compareRatios);
+ that.checkTemperament(compareRatios);
- docById("done_").onclick = () => {
+ docById("done_").onclick = function () {
//Go to main Circle of Notes
- this.ratios = this.tempRatios.slice();
- this.pitchNumber = this.ratios.length - 1;
- frequency1 = this.frequencies[0];
- this.frequencies = [];
- for (let i = 0; i <= this.pitchNumber; i++) {
- this.frequencies[i] = this.ratios[i] * frequency1;
- this.frequencies[i] = this.frequencies[i].toFixed(2);
+ that.ratios = that.tempRatios.slice();
+ that.pitchNumber = that.ratios.length - 1;
+ const frequency1 = that.frequencies[0];
+ that.frequencies = [];
+ for (let i = 0; i <= that.pitchNumber; i++) {
+ that.frequencies[i] = that.ratios[i] * frequency1;
+ that.frequencies[i] = that.frequencies[i].toFixed(2);
}
- for (let i = 0; i < this.ratios.length; i++) {
- compareRatios[i] = this.ratios[i];
+ for (let i = 0; i < that.ratios.length; i++) {
+ compareRatios[i] = that.ratios[i];
compareRatios[i] = compareRatios[i].toFixed(2);
}
- this.checkTemperament(compareRatios);
- this._circleOfNotes();
- this.NEqTempPitchNumber = null;
- this.NEqTempHzs = [];
+ that.checkTemperament(compareRatios);
+ that._circleOfNotes();
+ that.NEqTempPitchNumber = null;
+ that.NEqTempHzs = [];
};
- docById("preview").onclick = () => {
- this.ratioEdit();
- this.NEqTempPitchNumber = null;
- this.NEqTempHzs = [];
+ docById("preview").onclick = function () {
+ that.ratioEdit();
+ that.NEqTempPitchNumber = null;
+ that.NEqTempHzs = [];
};
}
};
- }
+ };
- /**
- * Triggerred when the Arbitrary edit option is selected.
- * @returns {void}
- */
- arbitraryEdit() {
+ this.arbitraryEdit = function () {
this.editMode = "arbitrary";
docById("userEdit").innerHTML = "";
const arbitraryEdit = docById("userEdit");
arbitraryEdit.innerHTML = ''; arbitraryEdit.style.paddingLeft = "0px"; - arbitraryEdit.style.backgroundColor = "#FFFFFF"; + + const that = this; const radius = 128; const height = 2 * radius; let angle1 = []; this.tempRatios1 = this.ratios.slice(); - this._createInnerWheel = (ratios, pitchNumber) => { + this._createInnerWheel = function (ratios, pitchNumber) { if (this.wheel1 !== undefined) { docById("wheelDiv4").display = "none"; this.wheel1.removeWheel(); @@ -1317,17 +1112,13 @@ class TemperamentWidget { pitchNumber = this.pitchNumber; } const labels = []; - let label; for (let j = 0; j < pitchNumber; j++) { - label = j.toString(); - labels.push(label); + labels.push(j.toString()); } docById("wheelDiv4").style.display = ""; docById("wheelDiv4").style.background = "none"; docById("wheelDiv4").style.position = "relative"; docById("wheelDiv4").style.zIndex = 5; - docById("wheelDiv4").style.marginTop = "13.5px"; - docById("wheelDiv4").style.marginLeft = "37.5px"; this.wheel1 = new wheelnav("wheelDiv4"); this.wheel1.wheelRadius = 200; this.wheel1.navItemsEnabled = false; @@ -1345,7 +1136,7 @@ class TemperamentWidget { const angle = []; const angleDiff = []; for (let i = 0; i < this.wheel1.navItemCount; i++) { - this.wheel1.navItems[i].fillAttr = TemperamentWidget.LIGHTGREY; + this.wheel1.navItems[i].fillAttr = "#e0e0e0"; this.wheel1.navItems[i].titleAttr.font = "20 20px Impact, Charcoal, sans-serif"; this.wheel1.navItems[i].titleSelectedAttr.font = "20 20px Impact, Charcoal, sans-serif"; @@ -1378,7 +1169,7 @@ class TemperamentWidget { this.wheel1.slicePathCustom.menuRadius = menuRadius; if (docById("frequencySlider") !== null) { - docById("frequencySlider").oninput = () => { + docById("frequencySlider").oninput = function () { this._refreshInnerWheel(); }; } @@ -1389,7 +1180,7 @@ class TemperamentWidget { arbitraryEdit.innerHTML += '
';
docById("noteInfo1").innerHTML +=
- '
';
+ '';
docById("noteInfo1").innerHTML +=
'';
+ '
' +
+ _("done") +
+ "
";
docById("noteInfo1").style.top = "100px";
docById("noteInfo1").style.left = "90px";
- docById("done").style.height = "30px";
- docById("done").style.lineHeight = "30px";
- docById("close").style.cursor = "pointer";
- docById("frequencySlider").oninput = () => {
- this._refreshInnerWheel();
+ docById("frequencySlider").oninput = function () {
+ that._refreshInnerWheel();
};
- docById("done").onclick = () => {
- this.tempRatios1 = this.tempRatios.slice();
- const pitchNumber = this.tempRatios1.length - 1;
- this._createOuterWheel(this.tempRatios1, pitchNumber);
+ docById("done").onclick = function () {
+ that.tempRatios1 = that.tempRatios.slice();
+ const pitchNumber = that.tempRatios1.length - 1;
+ that._createOuterWheel(that.tempRatios1, pitchNumber);
};
- docById("close").onclick = () => {
- this.tempRatios = this.tempRatios1.slice();
- const pitchNumber = this.tempRatios.length - 1;
- this._createInnerWheel(this.tempRatios, pitchNumber);
+ docById("close").onclick = function () {
+ that.tempRatios = that.tempRatios1.slice();
+ const pitchNumber = that.tempRatios.length - 1;
+ that._createInnerWheel(that.tempRatios, pitchNumber);
docById("noteInfo1").remove();
};
}
}
- }
-
- /**
- * Triggerred when in Arbritrary edit option.
- * The slider with option to slide the values of frequesncies opens for a refreshed value.
- * @returns {void}
- */
- _refreshInnerWheel() {
+ };
+
+ this._refreshInnerWheel = function () {
docById("frequencydiv").innerHTML = docById("frequencySlider").value;
const frequency = docById("frequencySlider").value;
const ratio = frequency / this.frequencies[0];
const ratioDifference = [];
this.tempRatios = this.tempRatios1.slice();
- let index;
for (let j = 0; j < this.tempRatios.length; j++) {
ratioDifference[j] = ratio - this.tempRatios[j];
ratioDifference[j] = ratioDifference[j].toFixed(2);
+ let index;
if (ratioDifference[j] < 0) {
index = j;
this.tempRatios.splice(index, 0, ratio);
break;
- }
- if (ratioDifference[j] == 0) {
+ } else if (ratioDifference[j] === 0) {
index = j;
this.tempRatios.splice(index, 1, ratio);
break;
}
}
const pitchNumber = this.tempRatios.length - 1;
- logo.resetSynth(0);
- logo.synth.trigger(
+ this._logo.resetSynth(0);
+ this._logo.synth.trigger(
0,
frequency,
Singer.defaultBPMFactor * 0.01,
@@ -1614,91 +1399,89 @@ class TemperamentWidget {
null
);
this._createInnerWheel(this.tempRatios, pitchNumber);
- }
+ };
- /**
- * Triggerred when in octave space edit option.
- * @returns {void}
- */
- octaveSpaceEdit() {
+ this.octaveSpaceEdit = function () {
this.editMode = "octave";
docById("userEdit").innerHTML = "";
const len = this.ratios.length;
const octaveRatio = this.ratios[len - 1];
const octaveSpaceEdit = docById("userEdit");
- octaveSpaceEdit.style.backgroundColor = "#FFFFFF";
+ octaveSpaceEdit.style.backgroundColor = "#c8C8C8";
octaveSpaceEdit.innerHTML =
- '
Octave Space
" + + _("octave space") + + ' :
'; octaveSpaceEdit.style.paddingLeft = "70px"; + const that = this; const divAppend = document.createElement("div"); divAppend.id = "divAppend"; - divAppend.innerHTML = "Done"; + divAppend.innerHTML = "done"; divAppend.style.textAlign = "center"; + divAppend.style.paddingTop = "5px"; divAppend.style.marginLeft = "-70px"; divAppend.style.backgroundColor = platformColor.selectorBackground; - divAppend.style.height = "30px"; + divAppend.style.height = "25px"; divAppend.style.marginTop = "40px"; - divAppend.style.lineHeight = divAppend.style.height; - divAppend.style.cursor = "pointer"; + divAppend.style.overflow = "auto"; octaveSpaceEdit.append(divAppend); - divAppend.onclick = () => { + divAppend.onmouseover = function () { + this.style.cursor = "pointer"; + }; + + divAppend.onclick = function () { const startRatio = docById("startNote").value; const endRatio = docById("endNote").value; const ratio = startRatio / endRatio; - let msg; - if (ratio != 2) { - msg = "Octave Space has changed. This changes temperament significantly"; - if (!confirm(msg)) { - return; - } + if (ratio !== 2) { + that.activity.textMsg( + _("The octave ratio has changed. This changes temperament significantly.") + ); } const powers = []; const compareRatios = []; - const frequency = this.frequencies[0]; - this.frequencies = []; + const frequency = that.frequencies[0]; + that.frequencies = []; for (let i = 0; i < len; i++) { - powers[i] = 12 * (Math.log10(this.ratios[i]) / Math.log10(this.powerBase)); - this.ratios[i] = Math.pow(ratio, powers[i] / 12); - compareRatios[i] = this.ratios[i].toFixed(2); - this.frequencies[i] = this.ratios[i] * frequency; - this.frequencies[i] = this.frequencies[i].toFixed(2); + powers[i] = 12 * (Math.log10(that.ratios[i]) / Math.log10(that.powerBase)); + that.ratios[i] = Math.pow(ratio, powers[i] / 12); + compareRatios[i] = that.ratios[i].toFixed(2); + that.frequencies[i] = that.ratios[i] * frequency; + that.frequencies[i] = that.frequencies[i].toFixed(2); } - this.powerBase = ratio; - this.typeOfEdit = "nonequal"; - this.checkTemperament(compareRatios); + that.powerBase = ratio; + that.typeOfEdit = "nonequal"; + that.checkTemperament(compareRatios); if (ratio != 2) { - this.octaveChanged = true; + that.octaveChanged = true; } - this._circleOfNotes(); + that._circleOfNotes(); }; - } + }; - /** - * Checks for temperament. - * @returns {void} - */ - checkTemperament(ratios) { + this.checkTemperament = function (ratios) { const intervals = []; let selectedTemperament; - let t, temperamentRatios, ratiosEqual; - for (const temperament in TEMPERAMENT) { - if (!isCustom(temperament)) { - t = TEMPERAMENT[temperament]; - temperamentRatios = []; + const keys = getTemperamentKeys(); + for (let i = 0; i < keys.length; i++) { + const temperament = keys[i]; + if (!isCustomTemperament(temperament)) { + const t = getTemperament(temperament); + const temperamentRatios = []; for (let j = 0; j < t.interval.length; j++) { intervals[j] = t.interval[j]; temperamentRatios[j] = t[intervals[j]]; temperamentRatios[j] = temperamentRatios[j].toFixed(2); } - ratiosEqual = + const ratiosEqual = ratios.length == temperamentRatios.length && - ratios.every((element, index) => { + ratios.every(function (element, index) { return element === temperamentRatios[index]; }); @@ -1715,19 +1498,14 @@ class TemperamentWidget { this.inTemperament = "custom"; temperamentCell.innerHTML = this.inTemperament; } - } + }; - /** - * Triggerred when Save button is pressed. New action blocks are generated. - * @returns {void} - */ - _save() { + this._save = function () { let notesMatch = false; - // let index = []; + let index = []; this.notes = []; - let cents, centsDiff, centsDiff1, min, idx; - if (isCustom(this.inTemperament)) { + if (isCustomTemperament(this.inTemperament)) { for (let i = 0; i < this.ratios.length; i++) { for (let j = 0; j < this.ratiosNotesPair.length; j++) { notesMatch = false; @@ -1738,59 +1516,72 @@ class TemperamentWidget { break; } } + if (!notesMatch) { - cents = 1200 * (Math.log10(this.ratios[i]) / Math.log10(this.powerBase)); - centsDiff = []; - centsDiff1 = []; + const cents = 1200 * (Math.log10(this.ratios[i]) / Math.log10(2)); + const centsDiff = []; + const centsDiff1 = []; for (let j = 0; j < this.cents.length; j++) { centsDiff[j] = cents - this.cents[j]; centsDiff1[j] = Math.abs(cents - this.cents[j]); } - min = centsDiff1.reduce((a, b) => { + const min = centsDiff1.reduce(function (a, b) { return Math.min(a, b); }); - idx = centsDiff1.indexOf(min); - - if (centsDiff[idx] < 0) { + index = centsDiff1.indexOf(min); + if (centsDiff[index] < 0) { this.notes[i] = - this.ratiosNotesPair[idx][1][0] + + this.ratiosNotesPair[index][1][0] + "(-" + - centsDiff1[idx].toFixed(0) + + centsDiff1[index].toFixed(0) + ")" + - this.ratiosNotesPair[idx][1][1]; + this.ratiosNotesPair[index][1][1]; } else { this.notes[i] = - this.ratiosNotesPair[idx][1][0] + + this.ratiosNotesPair[index][1][0] + "(+" + - centsDiff1[idx].toFixed(0) + + centsDiff1[index].toFixed(0) + ")" + - this.ratiosNotesPair[idx][1][1]; + this.ratiosNotesPair[index][1][1]; } } } } - // Global value - octaveRatio = this.powerBase; + setOctaveRatio(this.powerBase); - const value = logo.blocks.findUniqueTemperamentName(this.inTemperament); - this.inTemperament = value; // change from temporary "custom" to "custom1" or "custom2" .. + const len = this._logo.synth.startingPitch.length; + const note = this._logo.synth.startingPitch.substring(0, len - 1); + const octave = this._logo.synth.startingPitch.slice(-1); + const newStack1 = [ + [0, "settemperament", 150, 150, [null, 1, 2, 3, null]], + [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]], + [2, ["notename", { value: note }], 0, 0, [0]], + [3, ["number", { value: octave }], 0, 0, [0]] + ]; + this.activity.blocks.loadNewBlocks(newStack1); + + const value = this.activity.blocks.findUniqueTemperamentName(this.inTemperament); + // Change from temporary "custom" to "custom1" or "custom2" ... + this.inTemperament = value; const newStack = [ - [0, "temperament1", 100, 100, [null, 1, 2, null]], + [0, ["temperament1", { + collapsed: true + }], 150, 100, [null, 1, 2, null]], [1, ["text", { value: value }], 0, 0, [0]], [2, ["storein"], 0, 0, [0, 3, 4, 5]], - [3, ["text", { value: logo.synth.startingPitch }], 0, 0, [2]], + [3, ["text", { value: this._logo.synth.startingPitch }], 0, 0, [2]], [4, ["number", { value: this.frequencies[0] }], 0, 0, [2]], [5, ["octavespace"], 0, 0, [2, 6, 9]], [6, ["divide"], 0, 0, [5, 7, 8]], - [7, ["number", { value: rationalToFraction(octaveRatio)[0] }], 0, 0, [6]], - [8, ["number", { value: rationalToFraction(octaveRatio)[1] }], 0, 0, [6]], + [7, ["number", { value: rationalToFraction(getOctaveRatio())[0] }], 0, 0, [6]], + [8, ["number", { value: rationalToFraction(getOctaveRatio())[1] }], 0, 0, [6]], [9, "vspace", 0, 0, [5, 10]] ]; let previousBlock = 9; for (let i = 0; i < this.pitchNumber; i++) { - idx = newStack.length; + const idx = newStack.length; if ( this.inTemperament === "equal" || this.inTemperament === "1/3 comma meantone" || @@ -1806,7 +1597,7 @@ class TemperamentWidget { newStack.push([idx + 1, "multiply", 0, 0, [idx, idx + 2, idx + 3]]); newStack.push([ idx + 2, - ["namedbox", { value: logo.synth.startingPitch }], + ["namedbox", { value: this._logo.synth.startingPitch }], 0, 0, [idx + 1] @@ -1818,7 +1609,7 @@ class TemperamentWidget { newStack.push([idx + 7, ["number", { value: this.pitchNumber }], 0, 0, [idx + 5]]); newStack.push([idx + 8, "vspace", 0, 0, [idx, idx + 9]]); newStack.push([idx + 9, ["pitch"], 0, 0, [idx + 8, idx + 10, idx + 11, null]]); - if (!isCustom(this.inTemperament)) { + if (!isCustomTemperament(this.inTemperament)) { newStack.push([ idx + 10, ["notename", { value: this.ratiosNotesPair[i][1][0] }], @@ -1872,7 +1663,7 @@ class TemperamentWidget { newStack.push([idx + 1, "multiply", 0, 0, [idx, idx + 2, idx + 3]]); newStack.push([ idx + 2, - ["namedbox", { value: logo.synth.startingPitch }], + ["namedbox", { value: this._logo.synth.startingPitch }], 0, 0, [idx + 1] @@ -1895,7 +1686,7 @@ class TemperamentWidget { newStack.push([idx + 6, "vspace", 0, 0, [idx, idx + 7]]); newStack.push([idx + 7, ["pitch"], 0, 0, [idx + 6, idx + 8, idx + 9, null]]); - if (!isCustom(this.inTemperament)) { + if (!isCustomTemperament(this.inTemperament)) { newStack.push([ idx + 8, ["notename", { value: this.ratiosNotesPair[i][1][0] }], @@ -1940,64 +1731,54 @@ class TemperamentWidget { previousBlock = idx + 10; } } - logo.blocks.loadNewBlocks(newStack); - logo.textMsg(_("New action block generated!")); - const len = logo.synth.startingPitch.length; - const note = logo.synth.startingPitch.substring(0, len - 1); - const octave = logo.synth.startingPitch.slice(-1); - const newStack1 = [ - [0, "settemperament", 100, 100, [null, 1, 2, 3, null]], - [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]], - [2, ["notename", { value: note }], 0, 0, [0]], - [3, ["number", { value: octave }], 0, 0, [0]] - ]; - logo.blocks.loadNewBlocks(newStack1); - logo.textMsg(_("New action block generated!")); - - let number; - if (isCustom(this.inTemperament)) { - TEMPERAMENT[this.inTemperament] = []; - TEMPERAMENT[this.inTemperament]["pitchNumber"] = this.pitchNumber; - updateTemperaments(); + const that = this; + setTimeout(() => { + that.activity.blocks.loadNewBlocks(newStack); + that.activity.textMsg(_("New action block generated!")); + }, 500); + + if (isCustomTemperament(this.inTemperament)) { + deleteTemperamentFromList(this.inTemperament); + const newTemperament = { pitchNumber: this.pitchNumber }; for (let i = 0; i < this.pitchNumber; i++) { - number = "" + i; - TEMPERAMENT[this.inTemperament][number] = [ + const number = "" + i; + newTemperament[number] = [ this.ratios[i], this.notes[i].substring(0, this.notes[i].length - 1), - this.notes[i].slice(-1), - this.notes[i].substring(0, this.notes[i].length - 1) + this.notes[i].slice(-1) ]; } + // eslint-disable-next-line no-console + console.log(newTemperament); + addTemperamentToDictionary(this.inTemperament, newTemperament); + updateTemperaments(); } - if (isCustom(this.inTemperament)) { - logo.customTemperamentDefined = true; - logo.blocks.protoBlockDict["custompitch"].hidden = false; - logo.blocks.palettes.updatePalettes("pitch"); + if (isCustomTemperament(this.inTemperament)) { + this._logo.customTemperamentDefined = true; + this.activity.blocks.protoBlockDict["custompitch"].hidden = false; + this.activity.blocks.palettes.updatePalettes("pitch"); } - } - - /** - * Triggerred when play button is pressed on a single note in table. - * Notes are displayed in sequence and can be played one after another. - * @returns {void} - */ - playNote(pitchNumber) { - logo.resetSynth(0); + }; + + this.playNote = function (pitchNumber) { + this._logo.resetSynth(0); const duration = 1 / 2; let notes; + if (docById("wheelDiv4") == null) { notes = this.frequencies[pitchNumber]; - if (this.editMode == "equal" && this.eqTempHzs && this.eqTempHzs.length) + if (this.editMode == "equal" && this.eqTempHzs && this.eqTempHzs.length) { notes = this.eqTempHzs[pitchNumber]; - else if (this.editMode == "ratio" && this.NEqTempHzs && this.NEqTempHzs.length) + } else if (this.editMode == "ratio" && this.NEqTempHzs && this.NEqTempHzs.length) { notes = this.NEqTempHzs[pitchNumber]; + } } else { notes = this.tempRatios1[pitchNumber] * this.frequencies[0]; } - logo.synth.trigger( + this._logo.synth.trigger( 0, notes, Singer.defaultBPMFactor * duration, @@ -2005,21 +1786,14 @@ class TemperamentWidget { null, null ); - } - - /** - * Triggerred when play button is pressed. - * All Notes are played in sequence from the start. - * @returns {void} - */ - playAll() { + }; + + this.playAll = function () { let p = 0; this.playbackForward = true; this._playing = !this._playing; - if (!this._playing) { - return; - } - logo.resetSynth(0); + + this._logo.resetSynth(0); const cell = this.playButton; if (this._playing) { @@ -2031,14 +1805,29 @@ class TemperamentWidget { '" alt="' + _("Stop") + '" height="' + - TemperamentWidget.ICONSIZE + + ICONSIZE + '" width="' + - TemperamentWidget.ICONSIZE + + ICONSIZE + + '" vertical-align="middle" align-content="center"> '; + } else { + this._logo.synth.setMasterVolume(0); + this._logo.synth.stop(); + cell.innerHTML = + '
';
}
const duration = 1 / 2;
- const startingPitch = logo.synth.startingPitch;
+ const startingPitch = this._logo.synth.startingPitch;
const startingPitchOcatve = Number(startingPitch.slice(-1));
const octave = startingPitchOcatve - 1;
const startPitch = pitchToFrequency(
@@ -2048,32 +1837,27 @@ class TemperamentWidget {
"C Major"
);
+ const that = this;
let pitchNumber = this.pitchNumber;
- if (this.editMode == "equal" && this.eqTempPitchNumber)
+ if (this.editMode == "equal" && this.eqTempPitchNumber) {
pitchNumber = this.eqTempPitchNumber;
- else if (this.editMode == "ratio" && this.NEqTempPitchNumber)
+ } else if (this.editMode == "ratio" && this.NEqTempPitchNumber) {
pitchNumber = this.NEqTempPitchNumber;
+ }
+
if (docById("wheelDiv4") !== null) {
pitchNumber = this.tempRatios1.length - 1;
}
- const updateNotesCircle = (index,color) => {
- this.notesCircle.navItems[index].fillAttr = color;
- this.notesCircle.navItems[index].sliceHoverAttr.fill = color;
- this.notesCircle.navItems[index].slicePathAttr.fill = color;
- this.notesCircle.navItems[index].sliceSelectedAttr.fill = color;
- };
-
- const __playLoop = (i) => {
- let j;
+ const __playLoop = function (i) {
if (i === pitchNumber) {
- this.playbackForward = false;
+ that.playbackForward = false;
}
if (i === 0) {
p++;
}
- if (this._playing) {
- logo.synth.trigger(
+ if (that._playing) {
+ that._logo.synth.trigger(
0,
startPitch,
Singer.defaultBPMFactor * duration,
@@ -2081,121 +1865,104 @@ class TemperamentWidget {
null,
null
);
- this.playNote(i);
+ that.playNote(i);
}
- if (this.circleIsVisible == false && docById("wheelDiv4") == null) {
+
+ if (that.circleIsVisible == false && docById("wheelDiv4") == null) {
if (i === pitchNumber) {
- updateNotesCircle(0,TemperamentWidget.DARKGREY);
+ that.notesCircle.navItems[0].fillAttr = "#808080";
+ that.notesCircle.navItems[0].sliceHoverAttr.fill = "#808080";
+ that.notesCircle.navItems[0].slicePathAttr.fill = "#808080";
+ that.notesCircle.navItems[0].sliceSelectedAttr.fill = "#808080";
} else {
- updateNotesCircle(i,TemperamentWidget.DARKGREY);
+ that.notesCircle.navItems[i].fillAttr = "#808080";
+ that.notesCircle.navItems[i].sliceHoverAttr.fill = "#808080";
+ that.notesCircle.navItems[i].slicePathAttr.fill = "#808080";
+ that.notesCircle.navItems[i].sliceSelectedAttr.fill = "#808080";
}
- if (this.playbackForward == false && i < pitchNumber) {
+ if (that.playbackForward == false && i < pitchNumber) {
if (i === pitchNumber - 1) {
- updateNotesCircle(0,TemperamentWidget.GREY);
+ that.notesCircle.navItems[0].fillAttr = "#c8C8C8";
+ that.notesCircle.navItems[0].sliceHoverAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[0].slicePathAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[0].sliceSelectedAttr.fill = "#c8C8C8";
} else {
- updateNotesCircle(i + 1,TemperamentWidget.GREY);
+ that.notesCircle.navItems[i + 1].fillAttr = "#c8C8C8";
+ that.notesCircle.navItems[i + 1].sliceHoverAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i + 1].slicePathAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i + 1].sliceSelectedAttr.fill = "#c8C8C8";
}
} else {
if (i !== 0) {
- updateNotesCircle(i - 1,TemperamentWidget.GREY);
+ that.notesCircle.navItems[i - 1].fillAttr = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].sliceHoverAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].slicePathAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].sliceSelectedAttr.fill = "#c8C8C8";
}
}
- this.notesCircle.refreshWheel();
- } else if (this.circleIsVisible == true && docById("wheelDiv4") == null) {
+ that.notesCircle.refreshWheel();
+ } else if (that.circleIsVisible == true && docById("wheelDiv4") == null) {
docById("pitchNumber_" + i).style.background = platformColor.labelColor;
- if (this.playbackForward == false && i < pitchNumber) {
- j = i + 1;
+ if (that.playbackForward == false && i < pitchNumber) {
+ const j = i + 1;
docById("pitchNumber_" + j).style.background = platformColor.selectorBackground;
} else {
if (i !== 0) {
- j = i - 1;
+ const j = i - 1;
docById("pitchNumber_" + j).style.background =
platformColor.selectorBackground;
}
}
} else if (docById("wheelDiv4") !== null) {
if (i === pitchNumber) {
- updateNotesCircle(0,TemperamentWidget.DARKGREY);
+ that.wheel1.navItems[0].fillAttr = "#808080";
+ that.wheel1.navItems[0].sliceHoverAttr.fill = "#808080";
+ that.wheel1.navItems[0].slicePathAttr.fill = "#808080";
+ that.wheel1.navItems[0].sliceSelectedAttr.fill = "#808080";
} else {
- updateNotesCircle(i,TemperamentWidget.DARKGREY);
+ that.wheel1.navItems[i].fillAttr = "#808080";
+ that.wheel1.navItems[i].sliceHoverAttr.fill = "#808080";
+ that.wheel1.navItems[i].slicePathAttr.fill = "#808080";
+ that.wheel1.navItems[i].sliceSelectedAttr.fill = "#808080";
}
- if (this.playbackForward == false && i < pitchNumber) {
+ if (that.playbackForward == false && i < pitchNumber) {
if (i === pitchNumber - 1) {
- updateNotesCircle(0,TemperamentWidget.LIGHTGREY);
+ that.wheel1.navItems[0].fillAttr = "#e0e0e0";
+ that.wheel1.navItems[0].sliceHoverAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[0].slicePathAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[0].sliceSelectedAttr.fill = "#e0e0e0";
} else {
- updateNotesCircle(i + 1,TemperamentWidget.LIGHTGREY);
+ that.wheel1.navItems[i + 1].fillAttr = "#e0e0e0";
+ that.wheel1.navItems[i + 1].sliceHoverAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i + 1].slicePathAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i + 1].sliceSelectedAttr.fill = "#e0e0e0";
}
} else {
if (i !== 0) {
- updateNotesCircle(i - 1,TemperamentWidget.LIGHTGREY);
+ that.wheel1.navItems[i - 1].fillAttr = "#e0e0e0";
+ that.wheel1.navItems[i - 1].sliceHoverAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i - 1].slicePathAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i - 1].sliceSelectedAttr.fill = "#e0e0e0";
}
}
- this.wheel1.refreshWheel();
+ that.wheel1.refreshWheel();
}
- if (this.playbackForward) {
+ if (that.playbackForward) {
i += 1;
} else {
i -= 1;
}
- if (i <= pitchNumber && i >= 0 && p < 2) {
- setTimeout(() => {
- if (this.closed) {
- this.closed = !this.closed;
- return;
- } else if (!this._playing) {
- cell.innerHTML =
- ' 
';
- if (i !== -1) {
- if (this.circleIsVisible == false && docById("wheelDiv4") == null) {
- updateNotesCircle(i - 1,TemperamentWidget.GREY);
- if (i == 11) {
- //on completion of a full circle and on hitting '0' note in clockwise direction
- updateNotesCircle(0,TemperamentWidget.GREY);
- } else if (i < 11) {
- //in case of counter-clockwise direction, i.e., when this.playbackForward = false
- updateNotesCircle(i + 1,TemperamentWidget.GREY);
- }
- this.notesCircle.refreshWheel();
- } else if (
- this.circleIsVisible == true &&
- docById("wheelDiv4") == null
- ) {
- docById("pitchNumber_" + (i - 1)).style.background =
- platformColor.selectorBackground;
- } else if (docById("wheelDiv4") !== null) {
- this.wheel1.navItems[i - 1].fillAttr = TemperamentWidget.LIGHTGREY;
- this.wheel1.navItems[i - 1].sliceHoverAttr.fill =
- TemperamentWidget.LIGHTGREY;
- this.wheel1.navItems[i - 1].slicePathAttr.fill =
- TemperamentWidget.LIGHTGREY;
- this.wheel1.navItems[i - 1].sliceSelectedAttr.fill =
- TemperamentWidget.LIGHTGREY;
- this.wheel1.refreshWheel();
- }
- }
- this._playing = false;
- } else {
- __playLoop(i);
- }
+ if (i <= pitchNumber && i >= 0 && that._playing && p < 2) {
+ setTimeout(function () {
+ __playLoop(i);
}, Singer.defaultBPMFactor * 1000 * duration);
} else {
- this._playing = false;
cell.innerHTML =
' 
';
+ if (i !== -1) {
+ setTimeout(function () {
+ if (that.circleIsVisible == false && docById("wheelDiv4") == null) {
+ that.notesCircle.navItems[i - 1].fillAttr = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].sliceHoverAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].slicePathAttr.fill = "#c8C8C8";
+ that.notesCircle.navItems[i - 1].sliceSelectedAttr.fill = "#c8C8C8";
+ that.notesCircle.refreshWheel();
+ } else if (that.circleIsVisible == true && docById("wheelDiv4") == null) {
+ const j = i - 1;
+ docById("pitchNumber_" + j).style.background =
+ platformColor.selectorBackground;
+ } else if (docById("wheelDiv4") !== null) {
+ that.wheel1.navItems[i - 1].fillAttr = "#e0e0e0";
+ that.wheel1.navItems[i - 1].sliceHoverAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i - 1].slicePathAttr.fill = "#e0e0e0";
+ that.wheel1.navItems[i - 1].sliceSelectedAttr.fill = "#e0e0e0";
+ that.wheel1.refreshWheel();
+ }
+ }, Singer.defaultBPMFactor * 1000 * duration);
+ }
+ that._playing = false;
}
};
if (this._playing) {
__playLoop(0);
}
- }
+ };
+
+ this.init = function (activity) {
+ this.activity = activity;
+ this._logo = this.activity.logo;
+
+ const w = window.innerWidth;
+ this._cellScale = w / 1200;
+
+ const widgetWindow = window.widgetWindows.windowFor(this, "temperament");
+ this.widgetWindow = widgetWindow;
+ widgetWindow.clear();
+ widgetWindow.show();
+
+ widgetWindow.getWidgetBody().append(temperamentTableDiv);
+ widgetWindow.getWidgetBody().style.height = "500px";
+ widgetWindow.getWidgetBody().style.width = "500px";
+
+ const that = this;
+
+ widgetWindow.onclose = function () {
+ that._logo.synth.setMasterVolume(0);
+ that._logo.synth.stop();
+ if (docById("wheelDiv2") != null) {
+ docById("wheelDiv2").style.display = "none";
+ that.notesCircle.removeWheel();
+ }
+ if (docById("wheelDiv3") != null) {
+ docById("wheelDiv3").style.display = "none";
+ that.wheel.removeWheel();
+ }
+ if (docById("wheelDiv4") != null) {
+ docById("wheelDiv4").style.display = "none";
+ that.wheel1.removeWheel();
+ }
+
+ this.destroy();
+ };
+
+ this._playing = false;
+
+ const buttonTable = document.createElement("table");
+ const header = buttonTable.createTHead();
+ const row = header.insertRow(0);
+ row.id = "buttonsRow";
+
+ temperamentCell = row.insertCell();
+ temperamentCell.innerHTML = this.inTemperament;
+ temperamentCell.style.width = 2 * BUTTONSIZE + "px";
+ temperamentCell.style.minWidth = temperamentCell.style.width;
+ temperamentCell.style.maxWidth = temperamentCell.style.width;
+ temperamentCell.style.height = BUTTONSIZE + "px";
+ temperamentCell.style.minHeight = temperamentCell.style.height;
+ temperamentCell.style.maxHeight = temperamentCell.style.height;
+ temperamentCell.style.textAlign = "center";
+ temperamentCell.style.backgroundColor = platformColor.selectorBackground;
+
+ this.playButton = widgetWindow.addButton("play-button.svg", ICONSIZE, _("Play all"));
+ this.playButton.onclick = function () {
+ that.playAll();
+ };
+
+ widgetWindow.addButton("export-chunk.svg", ICONSIZE, _("Save")).onclick = function () {
+ that._save();
+ };
+
+ var noteCell = widgetWindow.addButton("play-button.svg", ICONSIZE, _("Table"));
+
+ let t = getTemperament(this.inTemperament);
+ this.pitchNumber = t.pitchNumber;
+ this.octaveChanged = false;
+ this.scale = this.scale[0] + " " + this.scale[1];
+ this.scaleNotes = buildScale(this.scale);
+ this.scaleNotes = this.scaleNotes[0];
+ this.powerBase = 2;
+ const startingPitch = this._logo.synth.startingPitch;
+ const str = [];
+ const note = [];
+ this.notes = [];
+ this.frequencies = [];
+ this.cents = [];
+ this.intervals = [];
+ this.ratios = [];
+ this.ratiosNotesPair = [];
+
+ for (let i = 0; i <= this.pitchNumber; i++) {
+ if (isCustomTemperament(this.inTemperament) && t["0"] !== undefined && t["0"][1] !== undefined) {
+ //If temperament selected is custom and it is defined by user.
+ const pitchNumber = i + "";
+ if (i === this.pitchNumber) {
+ this.notes[i] = [t["0"][1], Number(t["0"][2]) + 1];
+ this.ratios[i] = this.powerBase;
+ } else {
+ this.notes[i] = [t[pitchNumber][1], t[pitchNumber][2]];
+ this.ratios[i] = t[pitchNumber][0];
+ }
+ this.frequencies[i] = this._logo.synth
+ .getCustomFrequency(
+ this.notes[i][0] + this.notes[i][1] + "",
+ this.inTemperament
+ )
+ .toFixed(2);
+ this.cents[i] = 1200 * (Math.log10(this.ratios[i]) / Math.log10(2));
+ this.ratiosNotesPair[i] = [this.ratios[i], this.notes[i]];
+ } else {
+ if (isCustomTemperament(this.inTemperament)) {
+ // If temperament selected is custom and it is not
+ // yet defined by the user then custom temperament
+ // behaves like equal temperament.
+ t = getTemperament("equal");
+ }
+ str[i] = getNoteFromInterval(startingPitch, t.interval[i]);
+ this.notes[i] = str[i];
+ note[i] = str[i][0];
+
+ if (
+ str[i][0].substring(1, str[i][0].length) === FLAT ||
+ str[i][0].substring(1, str[i][0].length) === "b"
+ ) {
+ note[i] = str[i][0].replace(FLAT, "b");
+ } else if (
+ str[i][0].substring(1, str[i][0].length) === SHARP ||
+ str[i][0].substring(1, str[i][0].length) === "#"
+ ) {
+ note[i] = str[i][0].replace(SHARP, "#");
+ }
+
+ str[i] = note[i] + str[i][1];
+ this.frequencies[i] = this._logo.synth
+ ._getFrequency(str[i], true, this.inTemperament)
+ .toFixed(2);
+ this.intervals[i] = t.interval[i];
+ this.ratios[i] = t[this.intervals[i]];
+ this.cents[i] = 1200 * (Math.log10(this.ratios[i]) / Math.log10(2));
+ this.ratiosNotesPair[i] = [this.ratios[i], this.notes[i]];
+ }
+ }
+ this.toggleNotesButton = function () {
+ if (this.circleIsVisible) {
+ noteCell.getElementsByTagName("img")[0].src = "header-icons/circle.svg";
+ noteCell.getElementsByTagName("img")[0].title = "circle";
+ noteCell.getElementsByTagName("img")[0].alt = "circle";
+ } else {
+ noteCell.getElementsByTagName("img")[0].src = "header-icons/table.svg";
+ noteCell.getElementsByTagName("img")[0].title = "table";
+ noteCell.getElementsByTagName("img")[0].alt = "table";
+ }
+ };
+
+ this._circleOfNotes();
+
+ // eslint-disable-next-line no-unused-vars
+ noteCell.onclick = function (event) {
+ that.editMode = null;
+ if (that.circleIsVisible) {
+ that._circleOfNotes();
+ } else {
+ that._graphOfNotes();
+ }
+ };
+
+ widgetWindow.addButton(
+ "add2.svg",
+ ICONSIZE,
+ _("Add pitches")
+ // eslint-disable-next-line no-unused-vars
+ ).onclick = function (event) {
+ that.edit();
+ };
+
+ widgetWindow.sendToCenter();
+ };
}
diff --git a/js/widgets/tempo.js b/js/widgets/tempo.js
index 9cdf4f782e..a045a03728 100644
--- a/js/widgets/tempo.js
+++ b/js/widgets/tempo.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016-19 Walter Bender
+// Copyright (c) 2016-21 Walter Bender
// Copyright (c) 2016 Hemant Kasat
// This program is free software; you can redistribute it and/or
// modify it under the terms of the The GNU Affero General Public
@@ -12,19 +12,20 @@
// This widget enable us to manipulate the beats per minute. It
// behaves like a metronome and updates the master BPM block.
-/* global logo, _, saveLocally, getDrumSynthName */
+/*
+ global
+ _, getDrumSynthName
+ */
/*
Global locations
- js/activity.js
- logo, saveLocally
js/utils/musicutils.js
getDrumSynthName
js/utils/utils.js
_
*/
-/*exported Tempo */
+/* exported Tempo */
class Tempo {
static TEMPOSYNTH = "bottle";
static TEMPOINTERVAL = 5;
@@ -43,7 +44,8 @@ class Tempo {
this.tempoCanvases = [];
}
- init() {
+ init(activity) {
+ this.activity = activity;
this._directions = [];
this._widgetFirstTimes = [];
this._widgetNextTimes = [];
@@ -55,7 +57,7 @@ class Tempo {
}
this._intervalID = null;
- logo.synth.loadSynth(0, getDrumSynthName(Tempo.TEMPOSYNTH));
+ this.activity.logo.synth.loadSynth(0, getDrumSynthName(Tempo.TEMPOSYNTH));
if (this._intervalID != null) {
clearInterval(this._intervalID);
@@ -125,7 +127,7 @@ class Tempo {
let r1, r2, r3, tcCell;
for (let i = 0; i < this.BPMs.length; i++) {
this._directions.push(1);
- this._widgetFirstTimes.push(logo.firstNoteTime);
+ this._widgetFirstTimes.push(this.activity.logo.firstNoteTime);
if (this.BPMs[i] <= 0) {
this.BPMs[i] = 30;
}
@@ -189,7 +191,7 @@ class Tempo {
);
}
- logo.textMsg(_("Adjust the tempo with the buttons."));
+ this.activity.textMsg(_("Adjust the tempo with the buttons."));
this.resume();
widgetWindow.sendToCenter();
@@ -205,13 +207,13 @@ class Tempo {
let blockNumber;
if (this.BPMBlocks[i] != null) {
- blockNumber = logo.blocks.blockList[this.BPMBlocks[i]].connections[1];
+ blockNumber = this.activity.blocks.blockList[this.BPMBlocks[i]].connections[1];
if (blockNumber != null) {
- logo.blocks.blockList[blockNumber].value = parseFloat(this.BPMs[i]);
- logo.blocks.blockList[blockNumber].text.text = this.BPMs[i];
- logo.blocks.blockList[blockNumber].updateCache();
- logo.refreshCanvas();
- saveLocally();
+ this.activity.blocks.blockList[blockNumber].value = parseFloat(this.BPMs[i]);
+ this.activity.blocks.blockList[blockNumber].text.text = this.BPMs[i];
+ this.activity.blocks.blockList[blockNumber].updateCache();
+ this.activity.refreshCanvas();
+ this.activity.saveLocally();
}
}
}
@@ -256,10 +258,10 @@ class Tempo {
this.BPMs[i] = this.BPMInputs[i].value;
if (this.BPMs[i] > 1000) {
this.BPMs[i] = 1000;
- logo.errorMsg(_("The beats per minute must be between 30 and 1000."));
+ this.activity.errorMsg(_("The beats per minute must be between 30 and 1000."));
} else if (this.BPMs[i] < 30) {
this.BPMs[i] = 30;
- logo.errorMsg(_("The beats per minute must be between 30 and 1000."));
+ this.activity.errorMsg(_("The beats per minute must be between 30 and 1000."));
}
this._updateBPM(i);
@@ -275,7 +277,7 @@ class Tempo {
this.BPMs[i] = parseFloat(this.BPMs[i]) + Math.round(0.1 * this.BPMs[i]);
if (this.BPMs[i] > 1000) {
- logo.errorMsg(_("The beats per minute must be below 1000."));
+ this.activity.errorMsg(_("The beats per minute must be below 1000."));
this.BPMs[i] = 1000;
}
@@ -291,7 +293,7 @@ class Tempo {
slowDown(i) {
this.BPMs[i] = parseFloat(this.BPMs[i]) - Math.round(0.1 * this.BPMs[i]);
if (this.BPMs[i] < 30) {
- logo.errorMsg(_("The beats per minute must be above 30"));
+ this.activity.errorMsg(_("The beats per minute must be above 30"));
this.BPMs[i] = 30;
}
@@ -323,7 +325,7 @@ class Tempo {
// Are we done yet?
if (d.getTime() > this._widgetNextTimes[i]) {
// Play a tone.
- logo.synth.trigger(0, ["C2"], 0.0625, Tempo.TEMPOSYNTH, null, null, false);
+ this.activity.logo.synth.trigger(0, ["C2"], 0.0625, Tempo.TEMPOSYNTH, null, null, false);
this._widgetNextTimes[i] += this._intervals[i];
// Ensure we are at the edge.
@@ -401,8 +403,8 @@ class Tempo {
[4, ["number", { value: 4 }], 0, 0, [2]],
[5, ["vspace", {}], 0, 0, [0, null]]
];
- logo.blocks.loadNewBlocks(newStack);
- logo.textMsg(_("New action block generated!"));
+ this.activity.blocks.loadNewBlocks(newStack);
+ this.activity.textMsg(_("New action block generated!"));
}, 200 * i);
}
diff --git a/js/widgets/timbre.js b/js/widgets/timbre.js
index af00740ca4..1c04309094 100644
--- a/js/widgets/timbre.js
+++ b/js/widgets/timbre.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-20 Walter Bender
+// Copyright (c) 2017-21 Walter Bender
// Copyright (c) 2017 Tayba Wasim
// Copyright (c) 2017 Prachi Agrawal
//
@@ -12,15 +12,16 @@
// Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
/*
- global logo, blocks, DEFAULTOSCILLATORTYPE, platformColor, rationalToFraction, last, saveLocally,
- Singer, instrumentsEffects, instrumentsFilters, _, docById, DEFAULTFILTERTYPE, docByName,
- OSCTYPES, FILTERTYPES, oneHundredToFraction
+ global
+
+ DEFAULTOSCILLATORTYPE, platformColor, rationalToFraction, last,
+ Singer, instrumentsEffects:writeable, instrumentsFilters:writeable,
+ _, docById, DEFAULTFILTERTYPE, docByName, OSCTYPES, FILTERTYPES,
+ oneHundredToFraction
*/
/*
Global locations
- js/activity.js
- logo, blocks, savelocally
js/utils/musicutils.js
DEFAULTOSCILLATORTYPE, DEFAULTFILTERTYPE, OSCTYPES, FILTERTYPES
js/utils/platformstyle.js
@@ -177,66 +178,78 @@ class TimbreWidget {
if (this.isActive["envelope"] === true && this.env[i] != null) {
for (let j = 0; j < 4; j++) {
- updateParams[j] = blocks.blockList[this.env[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.env[i]].connections[j + 1];
}
}
if (this.isActive["filter"] === true && this.fil[i] != null) {
for (let j = 0; j < 3; j++) {
- updateParams[j] = blocks.blockList[this.fil[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.fil[i]].connections[j + 1];
}
}
if (this.isActive["oscillator"] === true && this.osc[i] != null) {
for (let j = 0; j < 2; j++) {
- updateParams[j] = blocks.blockList[this.osc[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.osc[i]].connections[j + 1];
}
}
if (this.isActive["amsynth"] === true && this.AMSynthesizer[i] != null) {
- updateParams[0] = blocks.blockList[this.AMSynthesizer[i]].connections[1];
+ updateParams[0] = this.activity.blocks.blockList[this.AMSynthesizer[i]].connections[1];
}
if (this.isActive["fmsynth"] === true && this.FMSynthesizer[i] != null) {
- updateParams[0] = blocks.blockList[this.FMSynthesizer[i]].connections[1];
+ updateParams[0] = this.activity.blocks.blockList[this.FMSynthesizer[i]].connections[1];
}
if (this.isActive["noisesynth"] === true && this.NoiseSynthesizer[i] != null) {
- updateParams[0] = blocks.blockList[this.NoiseSynthesizer[i]].connections[1];
+ updateParams[0] = this.activity.blocks.blockList[
+ this.NoiseSynthesizer[i]
+ ].connections[1];
}
if (this.isActive["duosynth"] === true && this.duoSynthesizer[i] != null) {
for (let j = 0; j < 2; j++) {
- updateParams[j] = blocks.blockList[this.duoSynthesizer[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[
+ this.duoSynthesizer[i]
+ ].connections[j + 1];
}
}
if (this.isActive["tremolo"] === true && this.tremoloEffect[i] != null) {
for (let j = 0; j < 2; j++) {
- updateParams[j] = blocks.blockList[this.tremoloEffect[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.tremoloEffect[i]].connections[
+ j + 1
+ ];
}
}
if (this.isActive["vibrato"] === true && this.vibratoEffect[i] != null) {
- updateParams[0] = blocks.blockList[this.vibratoEffect[i]].connections[1];
+ updateParams[0] = this.activity.blocks.blockList[this.vibratoEffect[i]].connections[1];
// The rate arg of the vibrato block must be in the form: a / b
- const divBlock = blocks.blockList[this.vibratoEffect[i]].connections[2];
+ const divBlock = this.activity.blocks.blockList[this.vibratoEffect[i]].connections[2];
if (
- blocks.blockList[divBlock].name === "divide" &&
- blocks.blockList[divBlock].connections[1] != null &&
- blocks.blockList[blocks.blockList[divBlock].connections[1]].name === "number" &&
- blocks.blockList[divBlock].connections[2] != null &&
- blocks.blockList[blocks.blockList[divBlock].connections[2]].name === "number"
+ this.activity.blocks.blockList[divBlock].name === "divide" &&
+ this.activity.blocks.blockList[divBlock].connections[1] != null &&
+ this.activity.blocks.blockList[
+ this.activity.blocks.blockList[divBlock].connections[1]
+ ].name === "number" &&
+ this.activity.blocks.blockList[divBlock].connections[2] != null &&
+ this.activity.blocks.blockList[
+ this.activity.blocks.blockList[divBlock].connections[2]
+ ].name === "number"
) {
- const numBlock = blocks.blockList[divBlock].connections[1];
- const denomBlock = blocks.blockList[divBlock].connections[2];
+ const numBlock = this.activity.blocks.blockList[divBlock].connections[1];
+ const denomBlock = this.activity.blocks.blockList[divBlock].connections[2];
updateParams[1] = denomBlock;
updateParams[2] = numBlock;
} else {
// Convert to a / b format
- const obj = rationalToFraction(logo.parseArg(logo, 0, divBlock, null, null));
- const n = blocks.blockList.length;
- blocks.loadNewBlocks([
+ const obj = rationalToFraction(
+ this.activity.logo.parseArg(this.activity.logo, 0, divBlock, null, null)
+ );
+ const n = this.activity.blocks.blockList.length;
+ this.activity.blocks.loadNewBlocks([
[0, ["divide", {}], 0, 0, [null, 1, 2]],
[1, ["number", { value: obj[0] }], 0, 0, [0]],
[2, ["number", { value: obj[1] }], 0, 0, [0]]
@@ -246,12 +259,12 @@ class TimbreWidget {
updateParams[2] = n + 1; // Numerator block
const __blockRefresher = () => {
- blocks.blockList[last(this.vibratoEffect)].connections[2] = n;
- blocks.blockList[n].connections[0] = last(this.vibratoEffect);
- blocks.blockList[divBlock].connections[0] = null;
- blocks.clampBlocksToCheck.push([n, 0]);
- blocks.clampBlocksToCheck.push([this.blockNo, 0]);
- blocks.adjustDocks(this.blockNo, true);
+ this.activity.blocks.blockList[last(this.vibratoEffect)].connections[2] = n;
+ this.activity.blocks.blockList[n].connections[0] = last(this.vibratoEffect);
+ this.activity.blocks.blockList[divBlock].connections[0] = null;
+ this.activity.blocks.clampBlocksToCheck.push([n, 0]);
+ this.activity.blocks.clampBlocksToCheck.push([this.blockNo, 0]);
+ this.activity.blocks.adjustDocks(this.blockNo, true);
};
setTimeout(__blockRefresher(), 250);
@@ -260,31 +273,37 @@ class TimbreWidget {
if (this.isActive["chorus"] === true && this.chorusEffect[i] != null) {
for (let j = 0; j < 3; j++) {
- updateParams[j] = blocks.blockList[this.chorusEffect[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.chorusEffect[i]].connections[
+ j + 1
+ ];
}
}
if (this.isActive["phaser"] === true && this.phaserEffect[i] != null) {
for (let j = 0; j < 3; j++) {
- updateParams[j] = blocks.blockList[this.phaserEffect[i]].connections[j + 1];
+ updateParams[j] = this.activity.blocks.blockList[this.phaserEffect[i]].connections[
+ j + 1
+ ];
}
}
if (this.isActive["distortion"] === true && this.distortionEffect[i] != null) {
- updateParams[0] = blocks.blockList[this.distortionEffect[i]].connections[1];
+ updateParams[0] = this.activity.blocks.blockList[
+ this.distortionEffect[i]
+ ].connections[1];
}
if (updateParams[0] != null) {
if (typeof value === "string") {
- blocks.blockList[updateParams[k]].value = value;
+ this.activity.blocks.blockList[updateParams[k]].value = value;
} else {
- blocks.blockList[updateParams[k]].value = parseFloat(value);
+ this.activity.blocks.blockList[updateParams[k]].value = parseFloat(value);
}
- blocks.blockList[updateParams[k]].text.text = value.toString();
- blocks.blockList[updateParams[k]].updateCache();
- logo.refreshCanvas();
- saveLocally();
+ this.activity.blocks.blockList[updateParams[k]].text.text = value.toString();
+ this.activity.blocks.blockList[updateParams[k]].updateCache();
+ this.activity.refreshCanvas();
+ this.activity.saveLocally();
}
}
@@ -295,7 +314,7 @@ class TimbreWidget {
* @returns {void}
*/
_playNote(note, duration) {
- logo.synth.setMasterVolume(last(Singer.masterVolume));
+ this.activity.logo.synth.setMasterVolume(last(Singer.masterVolume));
const timbreEffects = instrumentsEffects[0][this.instrumentName];
const paramsEffects = {
@@ -349,7 +368,7 @@ class TimbreWidget {
}
if (this.instrumentName in instrumentsFilters[0]) {
- logo.synth.trigger(
+ this.activity.logo.synth.trigger(
0,
note,
Singer.defaultBPMFactor * duration,
@@ -358,7 +377,7 @@ class TimbreWidget {
instrumentsFilters[0][this.instrumentName]
);
} else {
- logo.synth.trigger(
+ this.activity.logo.synth.trigger(
0,
note,
Singer.defaultBPMFactor * duration,
@@ -376,7 +395,7 @@ class TimbreWidget {
_play() {
this._playing = !this._playing;
- logo.resetSynth(0);
+ this.activity.logo.resetSynth(0);
const cell = this.playButton;
if (this._playing) {
@@ -393,8 +412,8 @@ class TimbreWidget {
TimbreWidget.ICONSIZE +
'" vertical-align="middle" align-content="center"> ';
} else {
- logo.synth.setMasterVolume(0);
- logo.synth.stop();
+ this.activity.logo.synth.setMasterVolume(0);
+ this.activity.logo.synth.stop();
cell.innerHTML =
' 
1) {
@@ -511,7 +535,12 @@ class TimbreWidget {
docById("myspanS0").textContent = this.FMSynthParams[0];
this.fmSynthParamvals["modulationIndex"] = parseFloat(this.FMSynthParams[0]);
this._update(blockValue, this.FMSynthParams[0], 0);
- logo.synth.createSynth(0, this.instrumentName, "fmsynth", this.fmSynthParamvals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ "fmsynth",
+ this.fmSynthParamvals
+ );
} else if (this.isActive["noisesynth"] === true) {
docById("synthButtonCell").style.backgroundColor = platformColor.selectorBackground;
if (this.NoiseSynthesizer.length > 1) {
@@ -522,7 +551,12 @@ class TimbreWidget {
docById("myspanS0").textContent = this.NoiseSynthParams[0];
this.noiseSynthParamvals["noise.type"] = this.NoiseSynthParams[0];
this._update(blockValue, this.NoiseSynthParams[0], 0);
- logo.synth.createSynth(0, this.instrumentName, "noisesynth", this.noiseSynthParamvals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ "noisesynth",
+ this.noiseSynthParamvals
+ );
} else if (this.isActive["duosynth"] === true) {
docById("synthButtonCell").style.backgroundColor = platformColor.selectorBackground;
if (this.duoSynthesizer.length > 1) {
@@ -537,7 +571,12 @@ class TimbreWidget {
docById("myspanS1").textContent = this.duoSynthParams[1];
this.duoSynthParamVals["vibratoAmount"] = parseFloat(this.duoSynthParams[1]);
this._update(blockValue, this.duoSynthParams[1], 1);
- logo.synth.createSynth(0, this.instrumentName, "duosynth", this.duoSynthParamVals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ "duosynth",
+ this.duoSynthParamVals
+ );
} else if (this.isActive["oscillator"]) {
docById("oscillatorButtonCell").style.backgroundColor =
platformColor.selectorBackground;
@@ -552,7 +591,12 @@ class TimbreWidget {
this._update(blockValue, "6", 1);
this.synthVals["oscillator"]["type"] = "sine6";
this.synthVals["oscillator"]["source"] = DEFAULTOSCILLATORTYPE;
- logo.synth.createSynth(0, this.instrumentName, this.oscParams[0], this.synthVals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ this.oscParams[0],
+ this.synthVals
+ );
} else if (this.isActive["filter"]) {
for (let i = 0; i < this.fil.length; i++) {
docById("filterButtonCell").style.backgroundColor =
@@ -661,7 +705,8 @@ class TimbreWidget {
* Initialises the timbre widget.
* @returns {void}
*/
- init() {
+ init(activity) {
+ this.activity = activity;
this._delta = 0;
this._playing = false;
@@ -680,7 +725,7 @@ class TimbreWidget {
widgetWindow.getWidgetBody().style.overflowY = "auto";
widgetWindow.onclose = () => {
- logo.hideMsgs();
+ this.activity.hideMsgs();
widgetWindow.destroy();
};
@@ -723,7 +768,7 @@ class TimbreWidget {
if (this.osc.length === 0) {
this._synth();
} else {
- logo.errorMsg(_("Unable to use synth due to existing oscillator"));
+ this.activity.errorMsg(_("Unable to use synth due to existing oscillator"));
}
};
@@ -744,17 +789,17 @@ class TimbreWidget {
this.isActive["oscillator"] = true;
if (this.osc.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo].connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const OSCILLATOROBJ = [
[0, ["oscillator", {}], 0, 0, [null, 2, 1, null]],
[1, ["number", { value: 6 }], 0, 0, [0]],
[2, ["oscillatortype", { value: DEFAULTOSCILLATORTYPE }], 0, 0, [0]]
];
- blocks.loadNewBlocks(OSCILLATOROBJ);
+ this.activity.blocks.loadNewBlocks(OSCILLATOROBJ);
- const n = blocks.blockList.length - 3;
+ const n = this.activity.blocks.blockList.length - 3;
this.osc.push(n);
this.oscParams.push(DEFAULTOSCILLATORTYPE);
this.oscParams.push(6);
@@ -793,8 +838,8 @@ class TimbreWidget {
this.isActive["envelope"] = true;
if (this.env.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo].connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const ENVOBJ = [
[0, ["envelope", {}], 0, 0, [null, 1, 2, 3, 4, null]],
@@ -803,9 +848,9 @@ class TimbreWidget {
[3, ["number", { value: 60 }], 0, 0, [0]],
[4, ["number", { value: 1 }], 0, 0, [0]]
];
- blocks.loadNewBlocks(ENVOBJ);
+ this.activity.blocks.loadNewBlocks(ENVOBJ);
- const n = blocks.blockList.length - 5;
+ const n = this.activity.blocks.blockList.length - 5;
this.env.push(n);
this.ENVs.push(1);
this.ENVs.push(50);
@@ -855,8 +900,8 @@ class TimbreWidget {
this.isActive["filter"] = true;
if (this.fil.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo].connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const FILTEROBJ = [
[0, ["filter", {}], 0, 0, [null, 3, 1, 2, null]],
@@ -864,9 +909,9 @@ class TimbreWidget {
[2, ["number", { value: 392 }], 0, 0, [0]],
[3, ["filtertype", { value: DEFAULTFILTERTYPE }], 0, 0, [0]]
];
- blocks.loadNewBlocks(FILTEROBJ);
+ this.activity.blocks.loadNewBlocks(FILTEROBJ);
- const n = blocks.blockList.length - 4;
+ const n = this.activity.blocks.blockList.length - 4;
this.fil.push(n);
this.filterParams.push(DEFAULTFILTERTYPE);
this.filterParams.push(-12);
@@ -910,7 +955,7 @@ class TimbreWidget {
// docById('timbreButtonsDiv').style.visibility = 'hidden';
// docById('this.timbreTableDiv').style.visibility = 'hidden';
// docById('timbreName').classList.remove('hasKeyboard');
- // logo.hideMsgs();
+ // this.activity.logo.hideMsgs();
// };
_unhighlightButtons = () => {
@@ -922,7 +967,7 @@ class TimbreWidget {
filterButtonCell.style.backgroundColor = platformColor.selectorBackground;
};
- logo.textMsg(_("Click on buttons to open the timbre design tools."));
+ this.activity.textMsg(_("Click on buttons to open the timbre design tools."));
widgetWindow.sendToCenter();
}
@@ -935,19 +980,19 @@ class TimbreWidget {
*/
clampConnection(n, clamp, topOfClamp) {
// Connect the clamp to the Widget block.
- blocks.blockList[this.blockNo].connections[2] = n;
- blocks.blockList[n].connections[0] = this.blockNo;
+ this.activity.blocks.blockList[this.blockNo].connections[2] = n;
+ this.activity.blocks.blockList[n].connections[0] = this.blockNo;
// If there were blocks in the Widget, move them inside the clamp.
if (topOfClamp != null) {
- blocks.blockList[n].connections[clamp] = topOfClamp;
- blocks.blockList[topOfClamp].connections[0] = n;
+ this.activity.blocks.blockList[n].connections[clamp] = topOfClamp;
+ this.activity.blocks.blockList[topOfClamp].connections[0] = n;
}
// Adjust the clamp sizes and positions.
- blocks.clampBlocksToCheck.push([n, 0]);
- blocks.clampBlocksToCheck.push([this.blockNo, 0]);
- blocks.adjustDocks(this.blockNo, true);
+ this.activity.blocks.clampBlocksToCheck.push([n, 0]);
+ this.activity.blocks.clampBlocksToCheck.push([this.blockNo, 0]);
+ this.activity.blocks.adjustDocks(this.blockNo, true);
}
/**
@@ -960,19 +1005,19 @@ class TimbreWidget {
*/
clampConnectionVspace(n, vspace, topOfClamp) {
// Connect the clamp to the Widget block.
- blocks.blockList[this.blockNo].connections[2] = n;
- blocks.blockList[n].connections[0] = this.blockNo;
+ this.activity.blocks.blockList[this.blockNo].connections[2] = n;
+ this.activity.blocks.blockList[n].connections[0] = this.blockNo;
// If there were blocks in the Widget, move them inside the clamp.
if (topOfClamp != null) {
- blocks.blockList[vspace].connections[1] = topOfClamp;
- blocks.blockList[topOfClamp].connections[0] = vspace;
+ this.activity.blocks.blockList[vspace].connections[1] = topOfClamp;
+ this.activity.blocks.blockList[topOfClamp].connections[0] = vspace;
}
// Adjust the clamp sizes and positions.
- blocks.clampBlocksToCheck.push([n, 0]);
- blocks.clampBlocksToCheck.push([this.blockNo, 0]);
- blocks.adjustDocks(this.blockNo, true);
+ this.activity.blocks.clampBlocksToCheck.push([n, 0]);
+ this.activity.blocks.clampBlocksToCheck.push([this.blockNo, 0]);
+ this.activity.blocks.adjustDocks(this.blockNo, true);
}
/**
@@ -1010,17 +1055,19 @@ class TimbreWidget {
*/
_blockReplace(oldblk, newblk) {
// Find the connections from the old block
- const c0 = blocks.blockList[oldblk].connections[0];
- const c1 = last(blocks.blockList[oldblk].connections);
+ const c0 = this.activity.blocks.blockList[oldblk].connections[0];
+ const c1 = last(this.activity.blocks.blockList[oldblk].connections);
// Connect the new block
- blocks.blockList[newblk].connections[0] = c0;
- blocks.blockList[newblk].connections[blocks.blockList[newblk].connections.length - 1] = c1;
+ this.activity.blocks.blockList[newblk].connections[0] = c0;
+ this.activity.blocks.blockList[newblk].connections[
+ this.activity.blocks.blockList[newblk].connections.length - 1
+ ] = c1;
if (c0 != null) {
- for (let i = 0; i < blocks.blockList[c0].connections.length; i++) {
- if (blocks.blockList[c0].connections[i] === oldblk) {
- blocks.blockList[c0].connections[i] = newblk;
+ for (let i = 0; i < this.activity.blocks.blockList[c0].connections.length; i++) {
+ if (this.activity.blocks.blockList[c0].connections[i] === oldblk) {
+ this.activity.blocks.blockList[c0].connections[i] = newblk;
break;
}
}
@@ -1028,36 +1075,36 @@ class TimbreWidget {
// Look for a containing clamp, which may need to be resized.
let blockAbove = c0;
while (blockAbove != this.blockNo) {
- if (blocks.blockList[blockAbove].isClampBlock()) {
- blocks.clampBlocksToCheck.push([blockAbove, 0]);
+ if (this.activity.blocks.blockList[blockAbove].isClampBlock()) {
+ this.activity.blocks.clampBlocksToCheck.push([blockAbove, 0]);
}
- blockAbove = blocks.blockList[blockAbove].connections[0];
+ blockAbove = this.activity.blocks.blockList[blockAbove].connections[0];
}
- blocks.clampBlocksToCheck.push([this.blockNo, 0]);
+ this.activity.blocks.clampBlocksToCheck.push([this.blockNo, 0]);
}
if (c1 != null) {
- for (let i = 0; i < blocks.blockList[c1].connections.length; i++) {
- if (blocks.blockList[c1].connections[i] === oldblk) {
- blocks.blockList[c1].connections[i] = newblk;
+ for (let i = 0; i < this.activity.blocks.blockList[c1].connections.length; i++) {
+ if (this.activity.blocks.blockList[c1].connections[i] === oldblk) {
+ this.activity.blocks.blockList[c1].connections[i] = newblk;
break;
}
}
}
// Refresh the dock positions
- blocks.adjustDocks(c0, true);
+ this.activity.blocks.adjustDocks(c0, true);
// Send the old block to the trash
- blocks.blockList[oldblk].connections[0] = null;
- blocks.blockList[oldblk].connections[
- blocks.blockList[oldblk].connections.length - 1
+ this.activity.blocks.blockList[oldblk].connections[0] = null;
+ this.activity.blocks.blockList[oldblk].connections[
+ this.activity.blocks.blockList[oldblk].connections.length - 1
] = null;
- blocks.sendStackToTrash(blocks.blockList[oldblk]);
+ this.activity.blocks.sendStackToTrash(this.activity.blocks.blockList[oldblk]);
- logo.refreshCanvas();
+ this.activity.refreshCanvas();
}
/**
@@ -1068,37 +1115,41 @@ class TimbreWidget {
* @returns {void}
*/
blockConnection(len, bottomOfClamp) {
- const n = blocks.blockList.length - len;
+ const n = this.activity.blocks.blockList.length - len;
if (bottomOfClamp == null) {
- blocks.blockList[this.blockNo].connections[2] = n;
- blocks.blockList[n].connections[0] = this.blockNo;
+ this.activity.blocks.blockList[this.blockNo].connections[2] = n;
+ this.activity.blocks.blockList[n].connections[0] = this.blockNo;
} else {
- let c = blocks.blockList[bottomOfClamp].connections.length - 1;
+ let c = this.activity.blocks.blockList[bottomOfClamp].connections.length - 1;
// Check for nested clamps.
// A hidden block is attached to the bottom of each clamp.
// But don't go inside a note block.
while (
- blocks.blockList[bottomOfClamp].name === "hidden" &&
- blocks.blockList[blocks.blockList[bottomOfClamp].connections[0]].name !== "newnote"
+ this.activity.blocks.blockList[bottomOfClamp].name === "hidden" &&
+ this.activity.blocks.blockList[
+ this.activity.blocks.blockList[bottomOfClamp].connections[0]
+ ].name !== "newnote"
) {
- const cblk = blocks.blockList[bottomOfClamp].connections[0];
- c = blocks.blockList[cblk].connections.length - 2;
- blocks.clampBlocksToCheck.push([cblk, 0]);
- if (blocks.blockList[cblk].connections[c] == null) {
+ const cblk = this.activity.blocks.blockList[bottomOfClamp].connections[0];
+ c = this.activity.blocks.blockList[cblk].connections.length - 2;
+ this.activity.blocks.clampBlocksToCheck.push([cblk, 0]);
+ if (this.activity.blocks.blockList[cblk].connections[c] == null) {
bottomOfClamp = cblk;
} else {
// Find bottom of stack
- bottomOfClamp = blocks.findBottomBlock(blocks.blockList[cblk].connections[c]);
- c = blocks.blockList[bottomOfClamp].connections.length - 1;
+ bottomOfClamp = this.activity.blocks.findBottomBlock(
+ this.activity.blocks.blockList[cblk].connections[c]
+ );
+ c = this.activity.blocks.blockList[bottomOfClamp].connections.length - 1;
}
}
- blocks.blockList[bottomOfClamp].connections[c] = n;
- blocks.blockList[n].connections[0] = bottomOfClamp;
+ this.activity.blocks.blockList[bottomOfClamp].connections[c] = n;
+ this.activity.blocks.blockList[n].connections[0] = bottomOfClamp;
}
- blocks.clampBlocksToCheck.push([this.blockNo, 0]);
- blocks.adjustDocks(this.blockNo, true);
+ this.activity.blocks.clampBlocksToCheck.push([this.blockNo, 0]);
+ this.activity.blocks.adjustDocks(this.blockNo, true);
}
/**
@@ -1164,22 +1215,23 @@ class TimbreWidget {
this.isActive["duosynth"] = false;
if (this.AMSynthesizer.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const AMSYNTHOBJ = [
[0, ["amsynth", {}], 0, 0, [null, 1, null]],
[1, ["number", { value: 1 }], 0, 0, [0]]
];
- blocks.loadNewBlocks(AMSYNTHOBJ);
+ this.activity.blocks.loadNewBlocks(AMSYNTHOBJ);
- const n = blocks.blockList.length - 2;
+ const n = this.activity.blocks.blockList.length - 2;
this.AMSynthesizer.push(n);
this.AMSynthParams.push(1);
this._changeBlock(last(this.AMSynthesizer), synthChosen, bottomOfClamp);
this.amSynthParamvals["harmonicity"] = parseFloat(this.AMSynthParams[0]);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"amsynth",
@@ -1213,7 +1265,7 @@ class TimbreWidget {
this.amSynthParamvals["harmonicity"] = parseFloat(elem.value);
docById("myspanS0").textContent = elem.value;
this._update(blockValue, elem.value, 0);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"amsynth",
@@ -1227,16 +1279,17 @@ class TimbreWidget {
this.isActive["duosynth"] = false;
if (this.FMSynthesizer.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const FMSYNTHOBJ = [
[0, ["fmsynth", {}], 0, 0, [null, 1, null]],
[1, ["number", { value: 10 }], 0, 0, [0]]
];
- blocks.loadNewBlocks(FMSYNTHOBJ);
+ this.activity.blocks.loadNewBlocks(FMSYNTHOBJ);
- const n = blocks.blockList.length - 2;
+ const n = this.activity.blocks.blockList.length - 2;
this.FMSynthesizer.push(n);
this.FMSynthParams.push(10);
@@ -1244,7 +1297,7 @@ class TimbreWidget {
this.fmSynthParamvals["modulationIndex"] = parseFloat(
this.FMSynthParams[0]
);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"fmsynth",
@@ -1278,7 +1331,7 @@ class TimbreWidget {
docById("myspanS0").textContent = elem.value;
this.fmSynthParamvals["modulationIndex"] = parseFloat(elem.value);
this._update(blockValue, elem.value, 0);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"fmsynth",
@@ -1293,22 +1346,23 @@ class TimbreWidget {
this.isActive["duosynth"] = false;
if (this.NoiseSynthesizer.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const NOISESYNTHOBJ = [
[0, ["noisesynth", {}], 0, 0, [null, 1, null]],
[1, ["number", { value: 10 }], 0, 0, [0]]
];
- blocks.loadNewBlocks(NOISESYNTHOBJ);
+ this.activity.blocks.loadNewBlocks(NOISESYNTHOBJ);
- const n = blocks.blockList.length - 2;
+ const n = this.activity.blocks.blockList.length - 2;
this.NoiseSynthesizer.push(n);
this.NoiseSynthParams.push("white");
this._changeBlock(last(this.NoiseSynthesizer), synthChosen, bottomOfClamp);
this.noiseSynthParamvals["noise.type"] = this.NoiseSynthParams[0];
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"noisesynth",
@@ -1342,7 +1396,7 @@ class TimbreWidget {
docById("myspanS0").textContent = elem.value;
this.noiseSynthParamvals["noise.type"] = parseFloat(elem.value);
this._update(blockValue, elem.value, 0);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"noisesynth",
@@ -1356,17 +1410,18 @@ class TimbreWidget {
this.isActive["duosynth"] = true;
if (this.duoSynthesizer.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
const DUOSYNTHOBJ = [
[0, ["duosynth", {}], 0, 0, [null, 1, 2, null]],
[1, ["number", { value: 10 }], 0, 0, [0]],
[2, ["number", { value: 6 }], 0, 0, [0]]
];
- blocks.loadNewBlocks(DUOSYNTHOBJ);
+ this.activity.blocks.loadNewBlocks(DUOSYNTHOBJ);
- const n = blocks.blockList.length - 3;
+ const n = this.activity.blocks.blockList.length - 3;
this.duoSynthesizer.push(n);
this.duoSynthParams.push(10);
this.duoSynthParams.push(6);
@@ -1376,7 +1431,7 @@ class TimbreWidget {
this.duoSynthParamVals["vibratoAmount"] = parseFloat(
this.duoSynthParams[1]
);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"duosynth",
@@ -1427,7 +1482,7 @@ class TimbreWidget {
docById("myspanS" + m).textContent = elem.value;
this._update(blockValue, elem.value, Number(m));
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
"duosynth",
@@ -1531,7 +1586,12 @@ class TimbreWidget {
this.synthVals["oscillator"]["type"] = elem.value + this.oscParams[1].toString();
this.synthVals["oscillator"]["source"] = elem.value;
this._update(blockValue, elem.value, 0);
- logo.synth.createSynth(0, this.instrumentName, this.oscParams[0], this.synthVals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ this.oscParams[0],
+ this.synthVals
+ );
this._playNote("G4", 1 / 8);
});
@@ -1543,7 +1603,12 @@ class TimbreWidget {
docById("myRangeO0").value = parseFloat(elem.value);
docById("myspanO0").textContent = elem.value;
this._update(blockValue, elem.value, 1);
- logo.synth.createSynth(0, this.instrumentName, this.oscParams[0], this.synthVals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ this.oscParams[0],
+ this.synthVals
+ );
this._playNote("G4", 1 / 8);
});
@@ -1554,7 +1619,12 @@ class TimbreWidget {
this.synthVals["oscillator"]["source"] = this.oscParams[0];
if (newOscillator) {
- logo.synth.createSynth(0, this.instrumentName, this.oscParams[0], this.synthVals);
+ this.activity.logo.synth.createSynth(
+ 0,
+ this.instrumentName,
+ this.oscParams[0],
+ this.synthVals
+ );
}
}
@@ -1625,7 +1695,7 @@ class TimbreWidget {
docById("myspan" + m).textContent = elem.value;
this.synthVals["envelope"][this.adsrMap[m]] = parseFloat(elem.value) / 100;
this._update(blockValue, parseFloat(elem.value), m);
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
this.synthVals["oscillator"]["source"],
@@ -1636,7 +1706,7 @@ class TimbreWidget {
}
if (newEnvelope) {
- logo.synth.createSynth(
+ this.activity.logo.synth.createSynth(
0,
this.instrumentName,
this.synthVals["oscillator"]["source"],
@@ -1819,7 +1889,7 @@ class TimbreWidget {
(el) => el.filterType === elem.value
);
if (error.length > 1) {
- logo.errorMsg(_("Filter already present."));
+ this.activity.errorMsg(_("Filter already present."));
}
this._playNote("G4", 1 / 8);
};
@@ -1909,11 +1979,11 @@ class TimbreWidget {
*/
_addFilter() {
const env = docById("timbreTable");
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
- const bottomOfClamp = blocks.findBottomBlock(topOfClamp);
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo].connections[2];
+ const bottomOfClamp = this.activity.blocks.findBottomBlock(topOfClamp);
// The block we'll be adding will be at the end of the list.
- this.fil.push(blocks.blockList.length);
+ this.fil.push(this.activity.blocks.blockList.length);
const selectedFilters = instrumentsFilters[0][this.instrumentName].slice();
const filterType = FILTERTYPES.slice().filter((filter) => {
@@ -1936,7 +2006,7 @@ class TimbreWidget {
// Don't create the new blocks until we know what filter to use.
const len = this.filterParams.length;
- blocks.loadNewBlocks([
+ this.activity.blocks.loadNewBlocks([
[0, ["filter", {}], 0, 0, [null, 3, 1, 2, null]],
[1, ["number", { value: this.filterParams[len - 2] }], 0, 0, [0]],
[2, ["number", { value: this.filterParams[len - 1] }], 0, 0, [0]],
@@ -2052,16 +2122,17 @@ class TimbreWidget {
if (this.tremoloEffect.length === 0) {
// This is the first block in the child stack
// of the Timbre clamp.
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
- const n = blocks.blockList.length;
+ const n = this.activity.blocks.blockList.length;
const TREMOLOOBJ = [
[0, ["tremolo", {}], 0, 0, [null, 1, 2, null, 3]],
[1, ["number", { value: 10 }], 0, 0, [0]],
[2, ["number", { value: 50 }], 0, 0, [0]],
[3, "hidden", 0, 0, [0, null]]
];
- blocks.loadNewBlocks(TREMOLOOBJ);
+ this.activity.blocks.loadNewBlocks(TREMOLOOBJ);
this.tremoloEffect.push(n);
this.tremoloParams.push(10);
@@ -2130,9 +2201,10 @@ class TimbreWidget {
docById("myspanFx1").textContent = obj[0] + "/" + obj[1]; // this.vibratoParams[1];
} else {
// If necessary, add a vibrato block.
- const topOfTimbreClamp = blocks.blockList[this.blockNo].connections[2];
+ const topOfTimbreClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
- const vibratoBlock = blocks.blockList.length;
+ const vibratoBlock = this.activity.blocks.blockList.length;
const VIBRATOOBJ = [
[0, ["vibrato", {}], 0, 0, [null, 1, 3, 2, 6]],
[1, ["number", { value: 5 }], 0, 0, [0]],
@@ -2142,7 +2214,7 @@ class TimbreWidget {
[5, ["number", { value: 16 }], 0, 0, [3]],
[6, ["hidden", {}], 0, 0, [0, null]]
];
- blocks.loadNewBlocks(VIBRATOOBJ);
+ this.activity.blocks.loadNewBlocks(VIBRATOOBJ);
this.vibratoEffect.push(vibratoBlock);
this.vibratoParams.push(5);
@@ -2235,9 +2307,10 @@ class TimbreWidget {
}
if (this.chorusEffect.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
- const n = blocks.blockList.length;
+ const n = this.activity.blocks.blockList.length;
const CHORUSOBJ = [
[0, ["chorus", {}], 0, 0, [null, 1, 2, 3, null, 4]],
[1, ["number", { value: 2 }], 0, 0, [0]],
@@ -2245,7 +2318,7 @@ class TimbreWidget {
[3, ["number", { value: 70 }], 0, 0, [0]],
[4, "hidden", 0, 0, [0, null]]
];
- blocks.loadNewBlocks(CHORUSOBJ);
+ this.activity.blocks.loadNewBlocks(CHORUSOBJ);
this.chorusEffect.push(n);
this.chorusParams.push(2);
@@ -2329,9 +2402,10 @@ class TimbreWidget {
}
if (this.phaserEffect.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
- const n = blocks.blockList.length;
+ const n = this.activity.blocks.blockList.length;
const PHASEROBJ = [
[0, ["phaser", {}], 0, 0, [null, 1, 2, 3, null, 4]],
[1, ["number", { value: 5 }], 0, 0, [0]],
@@ -2339,7 +2413,7 @@ class TimbreWidget {
[3, ["number", { value: 350 }], 0, 0, [0]],
[4, "hidden", 0, 0, [0, null]]
];
- blocks.loadNewBlocks(PHASEROBJ);
+ this.activity.blocks.loadNewBlocks(PHASEROBJ);
this.phaserEffect.push(n);
this.phaserParams.push(5);
@@ -2407,15 +2481,16 @@ class TimbreWidget {
}
if (this.distortionEffect.length === 0) {
- const topOfClamp = blocks.blockList[this.blockNo].connections[2];
+ const topOfClamp = this.activity.blocks.blockList[this.blockNo]
+ .connections[2];
- const n = blocks.blockList.length;
+ const n = this.activity.blocks.blockList.length;
const DISTORTIONOBJ = [
[0, ["dis", {}], 0, 0, [null, 1, null, 2]],
[1, ["number", { value: 40 }], 0, 0, [0]],
[2, "hidden", 0, 0, [0, null]]
];
- blocks.loadNewBlocks(DISTORTIONOBJ);
+ this.activity.blocks.loadNewBlocks(DISTORTIONOBJ);
this.distortionEffect.push(n);
this.distortionParams.push(40);
diff --git a/js/widgets/widgetWindows.js b/js/widgets/widgetWindows.js
index 6cce4c4e4f..f39e672b0f 100644
--- a/js/widgets/widgetWindows.js
+++ b/js/widgets/widgetWindows.js
@@ -9,12 +9,12 @@
// License along with this library; if not, write to the Free Software
// Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
-/*global _, docById*/
+/* global _, docById */
/*
Globals location
- js/utils/utils.js
-_, docById
+ _, docById
*/
window.widgetWindows = { openWindows: {}, _posCache: {} };
@@ -91,7 +91,7 @@ class WidgetWindow {
// not a relative in either direciton.
if (this._fullscreenEnabled) {
- this._drag.ondblclick = () => {
+ this._drag.ondblclick = (e) => {
this._maximize();
this.takeFocus();
this.onmaximize();
diff --git a/plugins/README.md b/plugins/README.md
old mode 100755
new mode 100644
diff --git a/plugins/accelerometer.json b/plugins/accelerometer.json
old mode 100755
new mode 100644
index 62b3b4a8b4..fb24a43f0d
--- a/plugins/accelerometer.json
+++ b/plugins/accelerometer.json
@@ -1,13 +1,13 @@
{
- "BLOCKPLUGINS": {
- "accelerometerz": "var accelerometerZBlk = new ProtoBlock('accelerometerz');accelerometerZBlk.palette = palettes.dict['sensors'];blocks.protoBlockDict['accelerometerz'] = accelerometerZBlk;accelerometerZBlk.staticLabels.push(_('motion z'));accelerometerZBlk.adjustWidthToLabel();accelerometerZBlk.parameterBlock();",
- "accelerometery": "var accelerometerYBlk = new ProtoBlock('accelerometery');accelerometerYBlk.palette = palettes.dict['sensors'];blocks.protoBlockDict['accelerometery'] = accelerometerYBlk;accelerometerYBlk.staticLabels.push(_('motion y'));accelerometerYBlk.adjustWidthToLabel();accelerometerYBlk.parameterBlock();",
- "accelerometerx": "var accelerometerXBlk = new ProtoBlock('accelerometerx');accelerometerXBlk.palette = palettes.dict['sensors'];blocks.protoBlockDict['accelerometerx'] = accelerometerXBlk;accelerometerXBlk.staticLabels.push(_('motion x'));accelerometerXBlk.adjustWidthToLabel();accelerometerXBlk.parameterBlock();"
- },
- "GLOBALS": "accelerometer = {'x': null, 'y': null, 'z': null};function saveAccelerometerData(event) { accelerometer['x'] = event.accelerationIncludingGravity.x; accelerometer['y'] = event.accelerationIncludingGravity.y; accelerometer['z'] = event.accelerationIncludingGravity.z;};if (window.DeviceMotionEvent) { window.addEventListener(\"devicemotion\", saveAccelerometerData, false);}else{ console.log(\"DeviceMotionEvent is not supported (no accelerometer)\");}",
+ "GLOBALS": "globalActivity.logo.pluginVars['accelerometer'] = {'x': null, 'y': null, 'z': null};const saveAccelerometerData = function (event) { globalActivity.logo.pluginVars['accelerometer']['x'] = event.accelerationIncludingGravity.x; globalActivity.logo.pluginVars['accelerometer']['y'] = event.accelerationIncludingGravity.y; globalActivity.logo.pluginVars['accelerometer']['z'] = event.accelerationIncludingGravity.z;};if (window.DeviceMotionEvent) { window.addEventListener('devicemotion', saveAccelerometerData, false);}else { globalActivity.errorMsg('DeviceMotionEvent is not supported (no accelerometer)');}",
"ARGPLUGINS": {
- "accelerometerz": "var block = logo.blocks.blockList[blk];block.value = accelerometer['z'];",
- "accelerometery": "var block = logo.blocks.blockList[blk];block.value = accelerometer['y'];",
- "accelerometerx": "var block = logo.blocks.blockList[blk];block.value = accelerometer['x'];"
+ "accelerometerx": "const accelBlock = globalActivity.blocks.blockList[blk];accelBlock.value = globalActivity.logo.pluginVars['accelerometer']['x'];",
+ "accelerometery": "const accelBlock = globalActivity.blocks.blockList[blk];accelBlock.value = globalActivity.logo.pluginVars['accelerometer']['y'];",
+ "accelerometerz": "const accelBlock = globalActivity.blocks.blockList[blk];accelBlock.value = globalActivity.logo.pluginVars['accelerometer']['z'];"
+ },
+ "BLOCKPLUGINS": {
+ "accelerometerx": "const accelerometerXBlk = new ProtoBlock('accelerometerx');accelerometerXBlk.palette = globalActivity.palettes.dict['sensors'];globalActivity.blocks.protoBlockDict['accelerometerx'] = accelerometerXBlk;accelerometerXBlk.staticLabels.push(_('motion x'));accelerometerXBlk.adjustWidthToLabel();accelerometerXBlk.parameterBlock();",
+ "accelerometery": "const accelerometerYBlk = new ProtoBlock('accelerometery');accelerometerYBlk.palette = globalActivity.palettes.dict['sensors'];globalActivity.blocks.protoBlockDict['accelerometery'] = accelerometerYBlk;accelerometerYBlk.staticLabels.push(_('motion y'));accelerometerYBlk.adjustWidthToLabel();accelerometerYBlk.parameterBlock();",
+ "accelerometerz": "const accelerometerZBlk = new ProtoBlock('accelerometerz');accelerometerZBlk.palette = globalActivity.palettes.dict['sensors'];globalActivity.blocks.protoBlockDict['accelerometerz'] = accelerometerZBlk;accelerometerZBlk.staticLabels.push(_('motion z'));accelerometerZBlk.adjustWidthToLabel();accelerometerZBlk.parameterBlock();"
}
-}
+}
\ No newline at end of file
diff --git a/plugins/accelerometer.rtp b/plugins/accelerometer.rtp
old mode 100755
new mode 100644
index 3662a0e712..7da52d137c
--- a/plugins/accelerometer.rtp
+++ b/plugins/accelerometer.rtp
@@ -16,51 +16,51 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see
Octave Space
" + + _("octave space") + + ' :
'; octaveSpaceEdit.style.paddingLeft = "70px"; + const that = this; const divAppend = document.createElement("div"); divAppend.id = "divAppend"; - divAppend.innerHTML = "Done"; + divAppend.innerHTML = "done"; divAppend.style.textAlign = "center"; + divAppend.style.paddingTop = "5px"; divAppend.style.marginLeft = "-70px"; divAppend.style.backgroundColor = platformColor.selectorBackground; - divAppend.style.height = "30px"; + divAppend.style.height = "25px"; divAppend.style.marginTop = "40px"; - divAppend.style.lineHeight = divAppend.style.height; - divAppend.style.cursor = "pointer"; + divAppend.style.overflow = "auto"; octaveSpaceEdit.append(divAppend); - divAppend.onclick = () => { + divAppend.onmouseover = function () { + this.style.cursor = "pointer"; + }; + + divAppend.onclick = function () { const startRatio = docById("startNote").value; const endRatio = docById("endNote").value; const ratio = startRatio / endRatio; - let msg; - if (ratio != 2) { - msg = "Octave Space has changed. This changes temperament significantly"; - if (!confirm(msg)) { - return; - } + if (ratio !== 2) { + that.activity.textMsg( + _("The octave ratio has changed. This changes temperament significantly.") + ); } const powers = []; const compareRatios = []; - const frequency = this.frequencies[0]; - this.frequencies = []; + const frequency = that.frequencies[0]; + that.frequencies = []; for (let i = 0; i < len; i++) { - powers[i] = 12 * (Math.log10(this.ratios[i]) / Math.log10(this.powerBase)); - this.ratios[i] = Math.pow(ratio, powers[i] / 12); - compareRatios[i] = this.ratios[i].toFixed(2); - this.frequencies[i] = this.ratios[i] * frequency; - this.frequencies[i] = this.frequencies[i].toFixed(2); + powers[i] = 12 * (Math.log10(that.ratios[i]) / Math.log10(that.powerBase)); + that.ratios[i] = Math.pow(ratio, powers[i] / 12); + compareRatios[i] = that.ratios[i].toFixed(2); + that.frequencies[i] = that.ratios[i] * frequency; + that.frequencies[i] = that.frequencies[i].toFixed(2); } - this.powerBase = ratio; - this.typeOfEdit = "nonequal"; - this.checkTemperament(compareRatios); + that.powerBase = ratio; + that.typeOfEdit = "nonequal"; + that.checkTemperament(compareRatios); if (ratio != 2) { - this.octaveChanged = true; + that.octaveChanged = true; } - this._circleOfNotes(); + that._circleOfNotes(); }; - } + }; - /** - * Checks for temperament. - * @returns {void} - */ - checkTemperament(ratios) { + this.checkTemperament = function (ratios) { const intervals = []; let selectedTemperament; - let t, temperamentRatios, ratiosEqual; - for (const temperament in TEMPERAMENT) { - if (!isCustom(temperament)) { - t = TEMPERAMENT[temperament]; - temperamentRatios = []; + const keys = getTemperamentKeys(); + for (let i = 0; i < keys.length; i++) { + const temperament = keys[i]; + if (!isCustomTemperament(temperament)) { + const t = getTemperament(temperament); + const temperamentRatios = []; for (let j = 0; j < t.interval.length; j++) { intervals[j] = t.interval[j]; temperamentRatios[j] = t[intervals[j]]; temperamentRatios[j] = temperamentRatios[j].toFixed(2); } - ratiosEqual = + const ratiosEqual = ratios.length == temperamentRatios.length && - ratios.every((element, index) => { + ratios.every(function (element, index) { return element === temperamentRatios[index]; }); @@ -1715,19 +1498,14 @@ class TemperamentWidget { this.inTemperament = "custom"; temperamentCell.innerHTML = this.inTemperament; } - } + }; - /** - * Triggerred when Save button is pressed. New action blocks are generated. - * @returns {void} - */ - _save() { + this._save = function () { let notesMatch = false; - // let index = []; + let index = []; this.notes = []; - let cents, centsDiff, centsDiff1, min, idx; - if (isCustom(this.inTemperament)) { + if (isCustomTemperament(this.inTemperament)) { for (let i = 0; i < this.ratios.length; i++) { for (let j = 0; j < this.ratiosNotesPair.length; j++) { notesMatch = false; @@ -1738,59 +1516,72 @@ class TemperamentWidget { break; } } + if (!notesMatch) { - cents = 1200 * (Math.log10(this.ratios[i]) / Math.log10(this.powerBase)); - centsDiff = []; - centsDiff1 = []; + const cents = 1200 * (Math.log10(this.ratios[i]) / Math.log10(2)); + const centsDiff = []; + const centsDiff1 = []; for (let j = 0; j < this.cents.length; j++) { centsDiff[j] = cents - this.cents[j]; centsDiff1[j] = Math.abs(cents - this.cents[j]); } - min = centsDiff1.reduce((a, b) => { + const min = centsDiff1.reduce(function (a, b) { return Math.min(a, b); }); - idx = centsDiff1.indexOf(min); - - if (centsDiff[idx] < 0) { + index = centsDiff1.indexOf(min); + if (centsDiff[index] < 0) { this.notes[i] = - this.ratiosNotesPair[idx][1][0] + + this.ratiosNotesPair[index][1][0] + "(-" + - centsDiff1[idx].toFixed(0) + + centsDiff1[index].toFixed(0) + ")" + - this.ratiosNotesPair[idx][1][1]; + this.ratiosNotesPair[index][1][1]; } else { this.notes[i] = - this.ratiosNotesPair[idx][1][0] + + this.ratiosNotesPair[index][1][0] + "(+" + - centsDiff1[idx].toFixed(0) + + centsDiff1[index].toFixed(0) + ")" + - this.ratiosNotesPair[idx][1][1]; + this.ratiosNotesPair[index][1][1]; } } } } - // Global value - octaveRatio = this.powerBase; + setOctaveRatio(this.powerBase); - const value = logo.blocks.findUniqueTemperamentName(this.inTemperament); - this.inTemperament = value; // change from temporary "custom" to "custom1" or "custom2" .. + const len = this._logo.synth.startingPitch.length; + const note = this._logo.synth.startingPitch.substring(0, len - 1); + const octave = this._logo.synth.startingPitch.slice(-1); + const newStack1 = [ + [0, "settemperament", 150, 150, [null, 1, 2, 3, null]], + [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]], + [2, ["notename", { value: note }], 0, 0, [0]], + [3, ["number", { value: octave }], 0, 0, [0]] + ]; + this.activity.blocks.loadNewBlocks(newStack1); + + const value = this.activity.blocks.findUniqueTemperamentName(this.inTemperament); + // Change from temporary "custom" to "custom1" or "custom2" ... + this.inTemperament = value; const newStack = [ - [0, "temperament1", 100, 100, [null, 1, 2, null]], + [0, ["temperament1", { + collapsed: true + }], 150, 100, [null, 1, 2, null]], [1, ["text", { value: value }], 0, 0, [0]], [2, ["storein"], 0, 0, [0, 3, 4, 5]], - [3, ["text", { value: logo.synth.startingPitch }], 0, 0, [2]], + [3, ["text", { value: this._logo.synth.startingPitch }], 0, 0, [2]], [4, ["number", { value: this.frequencies[0] }], 0, 0, [2]], [5, ["octavespace"], 0, 0, [2, 6, 9]], [6, ["divide"], 0, 0, [5, 7, 8]], - [7, ["number", { value: rationalToFraction(octaveRatio)[0] }], 0, 0, [6]], - [8, ["number", { value: rationalToFraction(octaveRatio)[1] }], 0, 0, [6]], + [7, ["number", { value: rationalToFraction(getOctaveRatio())[0] }], 0, 0, [6]], + [8, ["number", { value: rationalToFraction(getOctaveRatio())[1] }], 0, 0, [6]], [9, "vspace", 0, 0, [5, 10]] ]; let previousBlock = 9; for (let i = 0; i < this.pitchNumber; i++) { - idx = newStack.length; + const idx = newStack.length; if ( this.inTemperament === "equal" || this.inTemperament === "1/3 comma meantone" || @@ -1806,7 +1597,7 @@ class TemperamentWidget { newStack.push([idx + 1, "multiply", 0, 0, [idx, idx + 2, idx + 3]]); newStack.push([ idx + 2, - ["namedbox", { value: logo.synth.startingPitch }], + ["namedbox", { value: this._logo.synth.startingPitch }], 0, 0, [idx + 1] @@ -1818,7 +1609,7 @@ class TemperamentWidget { newStack.push([idx + 7, ["number", { value: this.pitchNumber }], 0, 0, [idx + 5]]); newStack.push([idx + 8, "vspace", 0, 0, [idx, idx + 9]]); newStack.push([idx + 9, ["pitch"], 0, 0, [idx + 8, idx + 10, idx + 11, null]]); - if (!isCustom(this.inTemperament)) { + if (!isCustomTemperament(this.inTemperament)) { newStack.push([ idx + 10, ["notename", { value: this.ratiosNotesPair[i][1][0] }], @@ -1872,7 +1663,7 @@ class TemperamentWidget { newStack.push([idx + 1, "multiply", 0, 0, [idx, idx + 2, idx + 3]]); newStack.push([ idx + 2, - ["namedbox", { value: logo.synth.startingPitch }], + ["namedbox", { value: this._logo.synth.startingPitch }], 0, 0, [idx + 1] @@ -1895,7 +1686,7 @@ class TemperamentWidget { newStack.push([idx + 6, "vspace", 0, 0, [idx, idx + 7]]); newStack.push([idx + 7, ["pitch"], 0, 0, [idx + 6, idx + 8, idx + 9, null]]); - if (!isCustom(this.inTemperament)) { + if (!isCustomTemperament(this.inTemperament)) { newStack.push([ idx + 8, ["notename", { value: this.ratiosNotesPair[i][1][0] }], @@ -1940,64 +1731,54 @@ class TemperamentWidget { previousBlock = idx + 10; } } - logo.blocks.loadNewBlocks(newStack); - logo.textMsg(_("New action block generated!")); - const len = logo.synth.startingPitch.length; - const note = logo.synth.startingPitch.substring(0, len - 1); - const octave = logo.synth.startingPitch.slice(-1); - const newStack1 = [ - [0, "settemperament", 100, 100, [null, 1, 2, 3, null]], - [1, ["temperamentname", { value: this.inTemperament }], 0, 0, [0]], - [2, ["notename", { value: note }], 0, 0, [0]], - [3, ["number", { value: octave }], 0, 0, [0]] - ]; - logo.blocks.loadNewBlocks(newStack1); - logo.textMsg(_("New action block generated!")); - - let number; - if (isCustom(this.inTemperament)) { - TEMPERAMENT[this.inTemperament] = []; - TEMPERAMENT[this.inTemperament]["pitchNumber"] = this.pitchNumber; - updateTemperaments(); + const that = this; + setTimeout(() => { + that.activity.blocks.loadNewBlocks(newStack); + that.activity.textMsg(_("New action block generated!")); + }, 500); + + if (isCustomTemperament(this.inTemperament)) { + deleteTemperamentFromList(this.inTemperament); + const newTemperament = { pitchNumber: this.pitchNumber }; for (let i = 0; i < this.pitchNumber; i++) { - number = "" + i; - TEMPERAMENT[this.inTemperament][number] = [ + const number = "" + i; + newTemperament[number] = [ this.ratios[i], this.notes[i].substring(0, this.notes[i].length - 1), - this.notes[i].slice(-1), - this.notes[i].substring(0, this.notes[i].length - 1) + this.notes[i].slice(-1) ]; } + // eslint-disable-next-line no-console + console.log(newTemperament); + addTemperamentToDictionary(this.inTemperament, newTemperament); + updateTemperaments(); } - if (isCustom(this.inTemperament)) { - logo.customTemperamentDefined = true; - logo.blocks.protoBlockDict["custompitch"].hidden = false; - logo.blocks.palettes.updatePalettes("pitch"); + if (isCustomTemperament(this.inTemperament)) { + this._logo.customTemperamentDefined = true; + this.activity.blocks.protoBlockDict["custompitch"].hidden = false; + this.activity.blocks.palettes.updatePalettes("pitch"); } - } - - /** - * Triggerred when play button is pressed on a single note in table. - * Notes are displayed in sequence and can be played one after another. - * @returns {void} - */ - playNote(pitchNumber) { - logo.resetSynth(0); + }; + + this.playNote = function (pitchNumber) { + this._logo.resetSynth(0); const duration = 1 / 2; let notes; + if (docById("wheelDiv4") == null) { notes = this.frequencies[pitchNumber]; - if (this.editMode == "equal" && this.eqTempHzs && this.eqTempHzs.length) + if (this.editMode == "equal" && this.eqTempHzs && this.eqTempHzs.length) { notes = this.eqTempHzs[pitchNumber]; - else if (this.editMode == "ratio" && this.NEqTempHzs && this.NEqTempHzs.length) + } else if (this.editMode == "ratio" && this.NEqTempHzs && this.NEqTempHzs.length) { notes = this.NEqTempHzs[pitchNumber]; + } } else { notes = this.tempRatios1[pitchNumber] * this.frequencies[0]; } - logo.synth.trigger( + this._logo.synth.trigger( 0, notes, Singer.defaultBPMFactor * duration, @@ -2005,21 +1786,14 @@ class TemperamentWidget { null, null ); - } - - /** - * Triggerred when play button is pressed. - * All Notes are played in sequence from the start. - * @returns {void} - */ - playAll() { + }; + + this.playAll = function () { let p = 0; this.playbackForward = true; this._playing = !this._playing; - if (!this._playing) { - return; - } - logo.resetSynth(0); + + this._logo.resetSynth(0); const cell = this.playButton; if (this._playing) { @@ -2031,14 +1805,29 @@ class TemperamentWidget { '" alt="' + _("Stop") + '" height="' + - TemperamentWidget.ICONSIZE + + ICONSIZE + '" width="' + - TemperamentWidget.ICONSIZE + + ICONSIZE + + '" vertical-align="middle" align-content="center"> '; + } else { + this._logo.synth.setMasterVolume(0); + this._logo.synth.stop(); + cell.innerHTML = + '