From 7660fb674b2a4f017397b27358b5b8d5fb7b3c2f Mon Sep 17 00:00:00 2001 From: laurent Date: Fri, 24 Jun 2022 11:58:19 +0200 Subject: [PATCH] Bug with some transposing instruments --- soloanalyser-interactive.qml | 3 ++- soloanalyser.qml | 9 +++++---- soloanalyser/core.js | 11 ++++++++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/soloanalyser-interactive.qml b/soloanalyser-interactive.qml index 622ac97..1bfbbaa 100644 --- a/soloanalyser-interactive.qml +++ b/soloanalyser-interactive.qml @@ -15,12 +15,13 @@ import "soloanalyser" /********************** /* Parking B - MuseScore - Solo Analyser plugin -/* v1.4.0 +/* v1.4.1 /* ChangeLog: /* - 1.3.0: Initial version based on SoloAnalyser 1.3.0 /* - 1.3.1: New altered notes color /* - 1.4.0: Multi track and voices /* - 1.4.0: Settings for the multi track and voices +/* - 1.4.1: Bug with some transposing instruments /**********************************************/ MuseScore { diff --git a/soloanalyser.qml b/soloanalyser.qml index 9fd02ee..1a01b75 100644 --- a/soloanalyser.qml +++ b/soloanalyser.qml @@ -9,7 +9,7 @@ import "soloanalyser/core.js" as Core /********************** /* Parking B - MuseScore - Solo Analyser plugin -/* v1.4.0 +/* v1.4.1 /* ChangeLog: /* - 1.0.0: Initial release /* - 1.0.1: Using of ChordAnalyzer shared library @@ -21,12 +21,13 @@ import "soloanalyser/core.js" as Core /* - 1.3.1: New altered notes color /* - 1.4.0: Multi track and voices /* - 1.4.0: Settings for the multi track and voices +/* - 1.4.1: Bug with some transposing instruments + bug when initiating useBelow/AboveSymbols /**********************************************/ MuseScore { menuPath: "Plugins." + pluginName description: "Colors and names the notes based on their role if chords/harmonies." - version: "1.4.0" + version: "1.4.1" readonly property var pluginName: "Solo Analyser" @@ -64,8 +65,8 @@ MuseScore { property var colorNotes: Core.defColorNotes property var nameNotes: Core.defNameNotes property var textType : Core.defTextType - property var useBelowSymbols : defUseBelowSymbols - property var useAboveSymbols : defUseAboveSymbols + property var useBelowSymbols : Core.defUseBelowSymbols + property var useAboveSymbols : Core.defUseAboveSymbols } MessageDialog { diff --git a/soloanalyser/core.js b/soloanalyser/core.js index 92e3455..5c71173 100644 --- a/soloanalyser/core.js +++ b/soloanalyser/core.js @@ -1,13 +1,14 @@ /********************** /* Parking B - MuseScore - Solo Analyser core plugin -/* v1.2.0 +/* v1.2.1 /* ChangeLog: /* - 1.0.0: Initial release /* - 1.1.0: New alteredColor /* - 1.2.0: Multi track /* - 1.2.0: Don't modify the note color on "Color none" /* - 1.2.0: Transposing instruments +/* - 1.2.1: Bug with some transposing instruments /**********************************************/ var degrees = '1;2;3;4;5;6;7;8;9;11;13'; @@ -160,7 +161,11 @@ function doAnalyse() { // !! The chord name is depending if we are in Instrument Pitch or Concert Pitch (this is automatic in MuseScore) // So we have to retrieve the pitch as shown on the score. In instrument pitch this might be different than the pitch // given by note.pitch which is corresponding to the *concert pitch*. - var tpitch = note.pitch - (note.tpc - note.tpc1); // note displayed as if it has that pitch + + // var tpitch = note.pitch - (note.tpc - note.tpc1); // note displayed as if it has that pitch + var tpitch = note.pitch + NoteHelper.deltaTpcToPitch(note.tpc,note.tpc1); // note displayed as if it has that pitch + + var p = (tpitch - curChord.pitch + 12) % 12; var color = null; if (p == 0) { @@ -191,7 +196,7 @@ function doAnalyse() { degree = role.role; } } - console.log(tpitch + ((tpitch!==note.pitch)?(" (transposing instrument !! original pitch: "+note.pitch+")"):"")+ " | " + curChord.pitch + " ==> " + p + " ==> " + color); + console.log("note pitch: "+tpitch + ((tpitch!==note.pitch)?(" (transposing!! original: "+note.pitch+")"):"")+ " | Chord pitch:" + curChord.pitch + " ==> position: " + p + " ==> color: " + color); } } else // no current chord, so resetting the color