Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding classes to widget/meterwidget.js #2652

Closed
wants to merge 3 commits into from
Closed

adding classes to widget/meterwidget.js #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27888ec
adding classes to widget/meterwidget.js
kushal-khare-official Nov 28, 2020
24a1eeb
Merge remote-tracking branch 'upstream/master' into editing-meter-wid…
kushal-khare-official Dec 7, 2020
deb2901
adding classes to meterwidget.js
kushal-khare-official Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions js/blocks/WidgetBlocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,17 +361,13 @@ function setupWidgetBlocks() {
}

flow(args, logo, turtle, blk) {
if (logo.meterWidget === null) {
logo.meterWidget = new MeterWidget();
}

logo.insideMeterWidget = true;

let listenerName = "_meterwidget_" + turtle;
logo.setDispatchBlock(blk, turtle, listenerName);

let __listener = function(event) {
logo.meterWidget.init(logo, logo._meterBlock, blk);
logo.meterWidget = new MeterWidget(logo, logo._meterBlock, blk);
logo.insideMeterWidget = false;
};

Expand Down
55 changes: 28 additions & 27 deletions js/widgets/meterwidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
// License along with this library; if not, write to the Free Software
// Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA

function MeterWidget() {
const BUTTONDIVWIDTH = 535;
const BUTTONSIZE = 53;
const ICONSIZE = 32;

class MeterWidget {
// A pie menu is used to show the meter and strong beats
const BUTTONDIVWIDTH = 535;
const BUTTONSIZE = 53;
const ICONSIZE = 32;

this.init = (logo, meterBlock, widgetBlock) => {
constructor(logo, meterBlock, widgetBlock) {
this._logo = logo;
this._meterBlock = meterBlock;
this._strongBeats = [];
Expand Down Expand Up @@ -170,13 +171,13 @@ function MeterWidget() {

this._logo.textMsg(_("Click in the circle to select strong beats for the meter."));
widgetWindow.sendToCenter();
};
}

this._get_click_lock = () => {
_get_click_lock() {
return this._click_lock;
};
}

this.__playDrum = (drum) => {
__playDrum(drum) {
this._logo.synth.trigger(
0,
"C4",
Expand All @@ -185,17 +186,17 @@ function MeterWidget() {
null,
null
);
};
}

this.__getPlayingStatus = () => {
__getPlayingStatus() {
return this._playing;
};
}

this.__getPauseStatus = () => {
__getPauseStatus() {
return !this._playing;
};
}

this.__playOneBeat = (i, ms) => {
__playOneBeat(i, ms) {
if (this.__getPauseStatus()) {
for (let i = 0; i < this._strongBeats.length; i++) {
this._playWheel.navItems[i].navItem.hide();
Expand All @@ -220,9 +221,9 @@ function MeterWidget() {
setTimeout(() => {
this.__playOneBeat((i + 1) % this._strongBeats.length, ms);
}, ms);
};
}

this._playBeat = () => {
_playBeat() {
let tur = this._logo.turtles.ithTurtle(0);
let bpmFactor =
TONEBPM / (tur.singer.bpm.length > 0 ? last(tur.singer.bpm) : Singer.masterBPM);
Expand All @@ -232,9 +233,9 @@ function MeterWidget() {

let noteBeatValue = bpmFactor * 1000 * this._beatValue;
this.__playOneBeat(0, noteBeatValue);
};
}

this._addButton = (row, icon, iconSize, label) => {
_addButton(row, icon, iconSize, label) {
let cell = row.insertCell(-1);
cell.innerHTML =
'&nbsp;&nbsp;<img src="header-icons/' +
Expand Down Expand Up @@ -265,9 +266,9 @@ function MeterWidget() {
};

return cell;
};
}

this._save = () => {
_save() {
// Export onbeatdo blocks for each strong beat
let strongBeats = [];
let newStack = [];
Expand Down Expand Up @@ -308,9 +309,9 @@ function MeterWidget() {

console.debug(newStack);
this._logo.blocks.loadNewBlocks(newStack);
};
}

this._piemenuMeter = (numberOfBeats, beatValue) => {
_piemenuMeter(numberOfBeats, beatValue) {
// pie menu for strong beat selection

docById("meterWheelDiv").style.display = "";
Expand Down Expand Up @@ -459,9 +460,9 @@ function MeterWidget() {
}

this.setupDefaultStrongWeakBeats(numberOfBeats, beatValue);
};
}

this.setupDefaultStrongWeakBeats = (numberOfBeats, beatValue) => {
setupDefaultStrongWeakBeats(numberOfBeats, beatValue) {
if (beatValue == 0.25 && numberOfBeats == 4) {
this._strongBeats[0] = true;
this._strongBeats[2] = true;
Expand All @@ -479,5 +480,5 @@ function MeterWidget() {
this._beatWheel.navItems[0].navItem.show();
this._beatWheel.navItems[3].navItem.show();
}
};
}
}
}