[WIP] Instrument change improvements

libmscore/CMakeLists.txt

@@ -64,7 +64,7 @@ add_library (
       drumset.cpp durationtype.cpp dynamic.cpp edit.cpp noteentry.cpp
       element.cpp excerpt.cpp
       fifo.cpp fret.cpp glissando.cpp hairpin.cpp
-      harmony.cpp hook.cpp image.cpp iname.cpp instrchange.cpp
+      harmony.cpp hook.cpp image.cpp iname.cpp instrchange.cpp instrchangewarning.cpp
       instrtemplate.cpp instrument.cpp interval.cpp
       key.cpp keysig.cpp lasso.cpp
       layoutbreak.cpp layout.cpp line.cpp lyrics.cpp measurebase.cpp

libmscore/chord.cpp

@@ -1711,7 +1711,7 @@ void Chord::cmdUpdateNotes(AccidentalState* as)
       const Staff* st = staff();
       StaffGroup staffGroup = st->staffType(tick())->group();
       if (staffGroup == StaffGroup::TAB) {
-            const Instrument* instrument = part()->instrument();
+            const Instrument* instrument = part()->instrument(tick());
             for (Chord* ch : graceNotes())
                   instrument->stringData()->fretChords(ch);
             instrument->stringData()->fretChords(this);
@@ -1748,7 +1748,7 @@ void Chord::cmdUpdateNotes(AccidentalState* as)
                   }
             }
       else if (staffGroup == StaffGroup::PERCUSSION) {
-            const Instrument* instrument = part()->instrument();
+            const Instrument* instrument = part()->instrument(tick());
             const Drumset* drumset = instrument->drumset();
             if (!drumset)
                   qWarning("no drumset");

libmscore/chordrest.cpp

@@ -47,6 +47,7 @@
 #include "page.h"
 #include "hook.h"
 #include "rehearsalmark.h"
+#include "instrchange.h"
 
 namespace Ms {
 
@@ -536,14 +537,7 @@ Element* ChordRest::drop(EditData& data)
             case ElementType::STAFF_TEXT:
             case ElementType::SYSTEM_TEXT:
             case ElementType::STAFF_STATE:
-            case ElementType::INSTRUMENT_CHANGE:
-                  if (e->isInstrumentChange() && part()->instruments()->find(tick().ticks()) != part()->instruments()->end()) {
-                        qDebug()<<"InstrumentChange already exists at tick = "<<tick().ticks();
-                        delete e;
-                        return 0;
-                        }
                   // fall through
-
             case ElementType::REHEARSAL_MARK:
                   {
                   e->setParent(segment());
@@ -556,6 +550,24 @@ Element* ChordRest::drop(EditData& data)
                   score()->undoAddElement(e);
                   return e;
                   }
+            case ElementType::INSTRUMENT_CHANGE:
+                  if (part()->instruments()->find(tick().ticks()) != part()->instruments()->end()) {
+                        qDebug() << "InstrumentChange already exists at tick = " << tick().ticks();
+                        delete e;
+                        return 0;
+                        }
+                  else {
+                        InstrumentChange* ic = toInstrumentChange(e);
+                        ic->setParent(segment());
+                        ic->setTrack((track() / VOICES) * VOICES);
+                        Instrument* instr = ic->instrument();
+                        Instrument* prevInstr = part()->instrument(tick());
+                        if (instr && instr->isDifferentInstrument(*prevInstr)) {
+                              ic->setupInstrument(instr);
+                              }
+                        score()->undoAddElement(ic);
+                        return e;
+                        }
             case ElementType::FIGURED_BASS:
                   {
                   bool bNew;
@@ -1324,14 +1336,26 @@ bool ChordRest::isBefore(const ChordRest* o) const
 //   undoAddAnnotation
 //---------------------------------------------------------
 
-void ChordRest::undoAddAnnotation(Element* a)
+void ChordRest::undoAddAnnotation(Element* a, bool useTopStaff/* = false*/)
       {
       Segment* seg = segment();
       Measure* m = measure();
       if (m && m->isMMRest())
             seg = m->mmRestFirst()->findSegmentR(SegmentType::ChordRest, Fraction(0,1));
 
-      a->setTrack(a->systemFlag() ? 0 : track());
+      if (useTopStaff) {
+            Staff* topStaff = nullptr;
+            for (int i = 0; i < part()->nstaves(); i++) {
+                  if (part()->staff(i)->show()) {
+                        topStaff = part()->staff(i);
+                        break;
+                        }
+                  }
+            Q_ASSERT(topStaff && topStaff->show());
+            a->setTrack(topStaff->idx() * VOICES);
+            }
+      else
+            a->setTrack(a->systemFlag() ? 0 : track());
       a->setParent(seg);
       score()->undoAddElement(a);
       }

libmscore/chordrest.h

@@ -179,7 +179,7 @@ class ChordRest : public DurationElement {
 
       bool isBefore(const ChordRest*) const;
 
-      void undoAddAnnotation(Element*);
+      void undoAddAnnotation(Element* a, bool useTopStaff = false);
       };
 
 

libmscore/clef.cpp

@@ -286,6 +286,8 @@ void Clef::read(XmlReader& e)
                   _clefTypes._transposingClef = Clef::clefType(e.readElementText());
             else if (tag == "showCourtesyClef")
                   _showCourtesy = e.readInt();
+            else if (tag == "forInstrumentChange")
+                  _forInstrumentChange = e.readBool();
             else if (!Element::readProperties(e))
                   e.unknown();
             }
@@ -304,6 +306,8 @@ void Clef::write(XmlWriter& xml) const
       writeProperty(xml, Pid::CLEF_TYPE_TRANSPOSING);
       if (!_showCourtesy)
             xml.tag("showCourtesyClef", _showCourtesy);
+      if (_forInstrumentChange)
+            xml.tag("forInstrumentChange", _forInstrumentChange);
       Element::writeProperties(xml);
       xml.etag();
       }

libmscore/clef.h

@@ -131,6 +131,7 @@ class Clef final : public Element {
       SymId symId;
       bool _showCourtesy = true;
       bool _small = false;
+      bool _forInstrumentChange = false;
 
       ClefTypeList _clefTypes { ClefType::INVALID };
 
@@ -167,6 +168,9 @@ class Clef final : public Element {
       void setClefType(ClefType i);
       void setClefType(const QString& s);
 
+      void setForInstrumentChange(bool forInstrumentChange) { _forInstrumentChange = forInstrumentChange; }
+      bool forInstrumentChange() const { return _forInstrumentChange; }
+
       ClefTypeList clefTypeList() const     { return _clefTypes;                  }
       ClefType concertClef() const          { return _clefTypes._concertClef;     }
       ClefType transposingClef() const      { return _clefTypes._transposingClef; }