Merge pull request musescore#14804 from RomanPudashkin/change_instrum…

…ent_fix [MU4] Fix musescore#14722: Incorrect transposition when changing from one transposing instrument to another
Jojo-Schmitz · Nov 30, 2022 · ac3a095 · ac3a095
2 parents d7adc67 + f00f544
commit ac3a095
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 9 deletions.
diff --git a/src/engraving/libmscore/chordrest.cpp b/src/engraving/libmscore/chordrest.cpp
@@ -523,13 +523,19 @@ EngravingItem* ChordRest::drop(EditData& data)
         if (part()->instruments().find(tick().ticks()) != part()->instruments().end()) {
             LOGD() << "InstrumentChange already exists at tick = " << tick().ticks();
             delete e;
-            return 0;
+            return nullptr;
         } else {
             InstrumentChange* ic = toInstrumentChange(e);
             ic->setParent(segment());
             ic->setTrack(trackZeroVoice(track()));
-            Instrument* instr = part()->instrument(tick());
-            ic->setInstrument(instr);
+
+            const Instrument* instr = part()->instrument(tick());
+            IF_ASSERT_FAILED(instr) {
+                delete e;
+                return nullptr;
+            }
+
+            ic->setInstrument(*instr);
             score()->undoAddElement(ic);
             return e;
         }

diff --git a/src/engraving/libmscore/part.cpp b/src/engraving/libmscore/part.cpp
@@ -42,6 +42,7 @@ using namespace mu;
 using namespace mu::engraving;
 
 namespace mu::engraving {
+const Fraction Part::MAIN_INSTRUMENT_TICK = Fraction(-1, 1);
 //---------------------------------------------------------
 //   Part
 //---------------------------------------------------------

diff --git a/src/engraving/libmscore/part.h b/src/engraving/libmscore/part.h
@@ -87,6 +87,8 @@ class Part final : public EngravingObject
     friend class compat::Read206;
 
 public:
+    static const Fraction MAIN_INSTRUMENT_TICK;
+
     Part(Score* score = nullptr);
     void initFromInstrTemplate(const InstrumentTemplate*);
 

diff --git a/src/instrumentsscene/view/instrumentsettingsmodel.cpp b/src/instrumentsscene/view/instrumentsettingsmodel.cpp
@@ -42,6 +42,7 @@ void InstrumentSettingsModel::load(const QVariant& instrument)
     QVariantMap map = instrument.toMap();
     m_instrumentKey.partId = ID(map["partId"]);
     m_instrumentKey.instrumentId = map["instrumentId"].toString();
+    m_instrumentKey.tick = Part::MAIN_INSTRUMENT_TICK;
 
     const Part* part = notationParts()->part(m_instrumentKey.partId);
     if (!part) {

diff --git a/src/notation/internal/masternotationparts.cpp b/src/notation/internal/masternotationparts.cpp
@@ -144,7 +144,7 @@ void MasterNotationParts::replaceInstrument(const InstrumentKey& instrumentKey,
     startGlobalEdit();
 
     const Part* part = partModifiable(instrumentKey.partId);
-    bool isMainInstrument = part && isMainInstrumentForPart(instrumentKey.instrumentId, part);
+    bool isMainInstrument = part && isMainInstrumentForPart(instrumentKey, part);
 
     NotationParts::replaceInstrument(instrumentKey, newInstrument);
 

diff --git a/src/notation/internal/notationparts.cpp b/src/notation/internal/notationparts.cpp
@@ -560,7 +560,7 @@ void NotationParts::replaceInstrument(const InstrumentKey& instrumentKey, const
 
     startEdit();
 
-    if (isMainInstrumentForPart(instrumentKey.instrumentId, part)) {
+    if (isMainInstrumentForPart(instrumentKey, part)) {
         mu::engraving::Interval oldTranspose = part->instrument()->transpose();
 
         QString newInstrumentPartName = formatInstrumentTitle(newInstrument.trackName(), newInstrument.trait());

diff --git a/src/notation/notationtypes.h b/src/notation/notationtypes.h
@@ -348,9 +348,9 @@ struct InstrumentKey
     Fraction tick = mu::engraving::Fraction(0, 1);
 };
 
-inline bool isMainInstrumentForPart(const QString& instrumentId, const Part* part)
+inline bool isMainInstrumentForPart(const InstrumentKey& instrumentKey, const Part* part)
 {
-    return instrumentId == part->instrumentId();
+    return instrumentKey.instrumentId == part->instrumentId() && instrumentKey.tick == Part::MAIN_INSTRUMENT_TICK;
 }
 
 inline QString formatInstrumentTitle(const QString& instrumentName, const InstrumentTrait& trait)

diff --git a/src/notation/view/widgets/editstaff.cpp b/src/notation/view/widgets/editstaff.cpp
@@ -134,12 +134,17 @@ void EditStaff::setStaff(Staff* s, const Fraction& tick)
     Part* part = m_orgStaff->part();
     mu::engraving::Score* score = part->score();
 
-    m_instrument = *part->instrument(tick);
+    auto it = mu::findLessOrEqual(part->instruments(), tick.ticks());
+    if (it == part->instruments().cend()) {
+        return;
+    }
+
+    m_instrument = *it->second;
     m_orgInstrument = m_instrument;
 
     m_instrumentKey.instrumentId = m_instrument.id();
     m_instrumentKey.partId = part->id();
-    m_instrumentKey.tick = tick;
+    m_instrumentKey.tick = Fraction::fromTicks(it->first);
 
     m_staff = engraving::Factory::createStaff(part);
     mu::engraving::StaffType* stt = m_staff->setStaffType(Fraction(0, 1), *m_orgStaff->staffType(Fraction(0, 1)));