From 83c0ac76d150defa2254ce732effbc223fe0dabe Mon Sep 17 00:00:00 2001 From: ws Date: Tue, 14 Apr 2015 17:38:50 +0200 Subject: [PATCH] fix #51761 Slurs & lines disappear or move in the non-rewritten measures on add of time signature --- libmscore/edit.cpp | 4 +++- libmscore/undo.h | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp index c7dbd9f501f2..7363af6c8523 100644 --- a/libmscore/edit.cpp +++ b/libmscore/edit.cpp @@ -477,6 +477,8 @@ bool Score::rewriteMeasures(Measure* fm, Measure* lm, const Fraction& ns, int st nlm->setNext(m2->next()); s->undo(new InsertMeasures(nfm, nlm)); } + if (!fill.isZero()) + undoInsertTime(lm->endTick(), fill.ticks()); if (!range.write(rootScore(), fm->tick())) qFatal("Cannot write measures"); @@ -2769,7 +2771,7 @@ void Score::checkSpanner(int startTick, int endTick) if (s->type() == Element::Type::SLUR) { Segment* seg = tick2segmentMM(s->tick(), false, Segment::Type::ChordRest); if (!seg || !seg->element(s->track())) { - qDebug("checkSpanner::remove (1)"); + qDebug("checkSpanner::remove (1) tick %d seg %p", s->tick(), seg); sl.append(s); } else { diff --git a/libmscore/undo.h b/libmscore/undo.h index e0e9d83a7ead..071397dde926 100644 --- a/libmscore/undo.h +++ b/libmscore/undo.h @@ -455,21 +455,6 @@ class ChangeSingleBarLineSpan : public UndoCommand { UNDO_NAME("ChangeSingleBarLineSpan") }; -//--------------------------------------------------------- -// SigInsertTime -//--------------------------------------------------------- - -class SigInsertTime : public UndoCommand { - Score* score; - int tick; - int len; - void flip(); - - public: - SigInsertTime(Score*, int tick, int len); - UNDO_NAME("SigInsertTime") - }; - //--------------------------------------------------------- // TransposeHarmony //---------------------------------------------------------