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

FIXES #4070 The Pitch piemenu do not remember the last selected accidental value #4071

Merged
merged 6 commits into from
Nov 24, 2024
+42 −26
Merged

FIXES #4070 The Pitch piemenu do not remember the last selected accidental value #4071

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f91fe2
Update piemenus.js
omsuneri Nov 21, 2024
899975e
Update piemenus.js
omsuneri Nov 21, 2024
7080a5d
Update piemenus.js
omsuneri Nov 21, 2024
3369dd1
Update piemenus.js
omsuneri Nov 23, 2024
d2d2a56
Update piemenus.js
omsuneri Nov 24, 2024
02e7921
Update piemenus.js
omsuneri Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 42 additions & 26 deletions js/piemenus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const piemenuPitches = (
custom
) => {
let prevPitch = null;

let prevAccidental = block.prevAccidental || null; // to remember the previous accidental value
// wheelNav pie menu for pitch selection
if (block.blocks.stageClick) {
return;
Expand Down Expand Up @@ -334,30 +334,21 @@ const piemenuPitches = (

if (!custom) {
// Navigate to a the current accidental value.
if (accidental === "") {
block._accidentalsWheel.navigateWheel(2);
} else {
switch (accidental) {
case DOUBLEFLAT:
block._accidentalsWheel.navigateWheel(4);
break;
case FLAT:
block._accidentalsWheel.navigateWheel(3);
break;
case NATURAL:
block._accidentalsWheel.navigateWheel(2);
break;
case SHARP:
block._accidentalsWheel.navigateWheel(1);
break;
case DOUBLESHARP:
block._accidentalsWheel.navigateWheel(0);
break;
default:
block._accidentalsWheel.navigateWheel(2);
break;
}
}
let accidentalIndex = 2; // Default to "natural" if none is set.
if (prevAccidental !== null) {
accidentalIndex = accidentals.indexOf(prevAccidental);
} else if (accidental === DOUBLEFLAT) {
accidentalIndex = 4;
} else if (accidental === FLAT) {
accidentalIndex = 3;
} else if (accidental === NATURAL) {
accidentalIndex = 2;
} else if (accidental === SHARP) {
accidentalIndex = 1;
} else if (accidental === DOUBLESHARP) {
accidentalIndex = 0;
}
block._accidentalsWheel.navigateWheel(accidentalIndex);
}

if (hasOctaveWheel) {
Expand Down Expand Up @@ -605,7 +596,10 @@ const piemenuPitches = (
that.value += selection["attr"];
that.text.text = selection["note"] + selection["attr"];
}

// Store the selected accidental in the block for later use.
prevAccidental = selection["attr"];
block.prevAccidental = prevAccidental;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This retains the value during the session, but not between sessions. Maybe we need to think about saving/restoring this attribute with the block (much the way we do with the start block attributes).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like do you want the pitch block to save the data for last session like this @walterbender

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what should I change in this pr regarding the issue @walterbender

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you don't need to change anything in what you have already done, but in this function in activity.js, this.prepareExport, you can see how some attributes are stored in the start block. We'll want to do something similar with the pitch block. And then restore the state on project import (in loadNewBlocks in blocks.js.

But maybe all that complexity can be dealt with in a separate PR. Let me test this code as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay @walterbender i ll make a new PR in regards to these changes and will resolve soon.


that.container.setChildIndex(that.text, that.container.children.length - 1);
that.updateCache();
__pitchPreview();
Expand All @@ -631,6 +625,28 @@ const piemenuPitches = (
// Hide the widget when the exit button is clicked.
block._exitWheel.navItems[0].navigateFunction = () => {
that._piemenuExitTime = new Date().getTime();
const selectedNote =
that._pitchWheel.navItems[that._pitchWheel.selectedNavItemIndex].title;
const selectedAccidental =
!custom && that._accidentalsWheel
? that._accidentalsWheel.navItems[that._accidentalsWheel.selectedNavItemIndex].title
: "";

// Update the block's displayed text with the note and accidental
if (selectedAccidental === "♮" || selectedAccidental === "") {
// Natural or no accidental: display only the note
that.text.text = selectedNote;
} else {
// Combine note and accidental for display
that.text.text = selectedNote + selectedAccidental;
}
// Update the block value and refresh the cache
that.value = selectedNote + (selectedAccidental === "♮" ? "" : selectedAccidental);
// Ensure proper layering of the text element
that.container.setChildIndex(that.text, that.container.children.length - 1);
// Refresh the block's cache
that.updateCache();
// Hide the pie menu and remove the wheels
docById("wheelDiv").style.display = "none";
that._pitchWheel.removeWheel();
if (!custom) {
Expand Down
Loading