LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8142 from Jojo-Schmitz/notenames

Browse source 
[MU4] Notenames plugins: For hidden notes skip notenames
This commit is contained in:
RomanPudashkin 2021-06-13 11:57:37 +02:00 committed by GitHub
commit 53aa4173e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
share/plugins/notenames-interactive.qml
View file

@ -25,7 +25,7 @@ import QtQuick.Controls 2.0
import MuseScore 3.0
MuseScore {
version: "3.4"
version: "3.5"
description: qsTr("This plugin names notes as per your language setting")
menuPath: "Plugins.Notes." + qsTr("Note Names (Interactive)")
pluginType: "dock"
@ -64,9 +64,11 @@ MuseScore {
function getChordName(chord) {
var text = "";
var notes = chord.notes;
var sep = "\n"; // change to "," if you want them horizontally (anybody?)
for (var i = 0; i < notes.length; i++) {
var sep = "\n"; // change to "," if you want them horizontally (anybody?)
if ( i > 0 )
if ((curScore.selection.elements.length && !notes[i].selected) || !notes[i].visible)
continue // skip notes a that are not selected or invisible
if (text) // only if text isn't empty
text = sep + text; // any but top note
if (typeof notes[i].tpc === "undefined") // like for grace notes ?!?
return;

22
share/plugins/notenames.qml
View file

@ -24,7 +24,7 @@ import QtQuick 2.2
import MuseScore 3.0
MuseScore {
version: "3.4.2.1"
version: "3.5"
description: qsTr("This plugin names notes as per your language setting")
menuPath: "Plugins.Notes." + qsTr("Note Names")
@ -32,10 +32,12 @@ MuseScore {
property var fontSizeMini: 0.7;
function nameChord (notes, text, small) {
var sep = "\n"; // change to "," if you want them horizontally (anybody?)
for (var i = 0; i < notes.length; i++) {
var sep = "\n"; // change to "," if you want them horizontally (anybody?)
if ( i > 0 )
text.text = sep + text.text; // any but top note
if ((curScore.selection.elements.length && !notes[i].selected) || !notes[i].visible)
continue // skip notes that are not selected or invisible
if (text.text) // only if text isn't empty
text.text = sep + text.text;
if (small)
text.fontSize *= fontSizeMini
if (typeof notes[i].tpc === "undefined") // like for grace notes ?!?
@ -135,7 +137,8 @@ MuseScore {
var chord = list[chordNum];
// Set note text, grace notes are shown a bit smaller
nameChord(chord.notes, text, small)
cursor.add(text)
if (text.text)
cursor.add(text)
// X position the note name over the grace chord
text.offsetX = chord.posX
switch (cursor.voice) {
@ -143,7 +146,8 @@ MuseScore {
}
// If we consume a STAFF_TEXT we must manufacture a new one.
text = newElement(Element.STAFF_TEXT); // Make another STAFF_TEXT
if (text.text)
text = newElement(Element.STAFF_TEXT); // Make another STAFF_TEXT
}
}
return text
@ -212,13 +216,15 @@ MuseScore {
// Now handle the note names on the main chord...
var notes = cursor.element.notes;
nameChord(notes, text, false);
cursor.add(text);
if (text.text)
cursor.add(text);
switch (cursor.voice) {
case 1: case 3: text.placement = Placement.BELOW; break;
}
text = newElement(Element.STAFF_TEXT) // Make another STAFF_TEXT object
if (text.text)
text = newElement(Element.STAFF_TEXT) // Make another STAFF_TEXT object
// Finally process trailing grace notes if they exist...
text = renderGraceNoteNames(cursor, trailingFifo, text, true)