implemented loop/loop-in/loop-out actions

fixed rebase problems
SKefalidis · Feb 16, 2021 · 9a5ad97 · 9a5ad97
1 parent 46792a2
commit 9a5ad97
Show file tree

Hide file tree

Showing 20 changed files with 130 additions and 205 deletions.
diff --git a/src/appshell/view/dockwindow/docktoolbar.cpp b/src/appshell/view/dockwindow/docktoolbar.cpp
@@ -159,16 +159,6 @@ bool DockToolBar::movable() const
     return toolBar()->isMovable();
 }
 
-bool DockToolBar::floating() const
-{
-    return m_floating;
-}
-
-bool DockToolBar::floatable() const
-{
-    return toolBar()->isFloatable();
-}
-
 void DockToolBar::setMinimumHeight(int minimumHeight)
 {
     if (m_minimumHeight == minimumHeight) {

diff --git a/src/framework/ui/view/iconcodes.h b/src/framework/ui/view/iconcodes.h
@@ -254,7 +254,6 @@ class IconCode
         NOTE_DOTTED_2 = 0xF395,
         NOTE_DOTTED_3 = 0xF396,
         NOTE_DOTTED_4 = 0xF397,
-        MIDI_INPUT = 0xEF98,
 
         NOTE_PLUS = 0xF39D,
         NOTE_TO_RIGHT = 0xF39E,

diff --git a/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledPopupView.qml b/src/framework/uicomponents/qml/MuseScore/UiComponents/StyledPopupView.qml
@@ -36,14 +36,6 @@ PopupView {
     property color fillColor: ui.theme.backgroundPrimaryColor
     readonly property int borderWidth: 1
 
-    function toggleOpened() {
-        if (isOpened) {
-            close()
-        } else {
-            open()
-        }
-    }
-
     closePolicy: PopupView.CloseOnPressOutsideParent
 
     onAboutToShow: {

diff --git a/src/framework/uicomponents/qml/MuseScore/UiComponents/TimeInputField.qml b/src/framework/uicomponents/qml/MuseScore/UiComponents/TimeInputField.qml
@@ -15,8 +15,6 @@ Row {
 
     property var font: ui.theme.tabFont
 
-    signal timeEdited(var newTime)
-
     spacing: 4
 
     opacity: enabled ? 1 : ui.theme.itemOpacityDisabled

diff --git a/src/notation/CMakeLists.txt b/src/notation/CMakeLists.txt
@@ -143,8 +143,6 @@ set(MODULE_SRC
     ${CMAKE_CURRENT_LIST_DIR}/view/notationcontextmenu.h
     ${CMAKE_CURRENT_LIST_DIR}/view/notationnavigator.cpp
     ${CMAKE_CURRENT_LIST_DIR}/view/notationnavigator.h
-    ${CMAKE_CURRENT_LIST_DIR}/view/undoredomodel.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/view/undoredomodel.h
     ${CMAKE_CURRENT_LIST_DIR}/view/internal/abstractnoteinputbaritem.cpp
     ${CMAKE_CURRENT_LIST_DIR}/view/internal/abstractnoteinputbaritem.h
     ${CMAKE_CURRENT_LIST_DIR}/view/internal/actionnoteinputbaritem.cpp

diff --git a/src/notation/inotationplayback.h b/src/notation/inotationplayback.h
@@ -48,7 +48,14 @@ class INotationPlayback
 
     virtual midi::MidiData playElementMidiData(const Element* element) const = 0;
 
-    virtual void addLoopBoundaryToSelectedNote(LoopBoundaryType boundaryType) = 0;
+    enum BoundaryTick: int {
+        FirstScoreTick = -3,
+        SelectedNoteTick,
+        LastScoreTick
+    };
+
+    virtual void addLoopBoundary(LoopBoundaryType boundaryType, int tick) = 0;
+    virtual void removeLoopBoundary() = 0;
     virtual async::Channel<LoopBoundary> loopBoundaryChanged() const = 0;
 
     virtual Tempo tempo(int tick) const = 0;

diff --git a/src/notation/internal/notationplayback.cpp b/src/notation/internal/notationplayback.cpp
@@ -569,44 +569,58 @@ MidiData NotationPlayback::playHarmonyMidiData(const Ms::Harmony* harmony) const
     return midiData;
 }
 
-void NotationPlayback::addLoopBoundaryToSelectedNote(LoopBoundaryType boundaryType)
+void NotationPlayback::addLoopBoundary(LoopBoundaryType boundaryType, int tick)
 {
+    if (tick == BoundaryTick::FirstScoreTick) {
+        tick = score()->firstMeasure()->tick().ticks();
+    } else if (tick == BoundaryTick::LastScoreTick) {
+        tick = score()->lastMeasure()->endTick().ticks();
+    }
+
     switch (boundaryType) {
     case LoopBoundaryType::LoopIn:
-        addLoopInToSelectedNote();
+        addLoopIn(tick);
         break;
     case LoopBoundaryType::LoopOut:
-        addLoopOutToSelectedNote();
+        addLoopOut(tick);
         break;
     case LoopBoundaryType::Unknown:
         break;
     }
 }
 
-void NotationPlayback::addLoopInToSelectedNote()
+void NotationPlayback::addLoopIn(int _tick)
 {
-    Fraction tick = score()->pos();
+    Fraction tick = _tick == BoundaryTick::SelectedNoteTick ? score()->pos() : Fraction::fromTicks(_tick);
 
     if (tick >= score()->loopOutTick()) { // If In pos >= Out pos, reset Out pos to end of score
-        score()->setPos(Ms::POS::RIGHT, score()->lastMeasure()->endTick());
+        score()->setLoopOutTick(score()->lastMeasure()->endTick());
     }
 
-    score()->setPos(Ms::POS::LEFT, tick);
+    score()->setLoopInTick(tick);
 }
 
-void NotationPlayback::addLoopOutToSelectedNote()
+void NotationPlayback::addLoopOut(int _tick)
 {
-    Fraction tick = score()->pos() + score()->inputState().ticks();
+    Fraction tick = _tick == BoundaryTick::SelectedNoteTick ? score()->pos() + score()->inputState().ticks() :
+                                                              Fraction::fromTicks(_tick);
 
     if (tick <= score()->loopInTick()) { // If Out pos <= In pos, reset In pos to beginning of score
-        score()->setPos(Ms::POS::LEFT, Fraction(0, 1));
+        score()->setLoopInTick(Fraction(0, 1));
     } else {
         if (tick > score()->lastMeasure()->endTick()) {
             tick = score()->lastMeasure()->endTick();
         }
     }
 
-    score()->setPos(Ms::POS::RIGHT, tick);
+    score()->setLoopOutTick(tick);
+}
+
+void NotationPlayback::removeLoopBoundary()
+{
+    Fraction null = Fraction::fromTicks(0);
+    score()->setLoopInTick(null);
+    score()->setLoopOutTick(null);
 }
 
 QRect NotationPlayback::loopBoundaryRectByTick(LoopBoundaryType boundaryType, int _tick) const
@@ -712,13 +726,12 @@ MeasureBeat NotationPlayback::measureBeat(int tick) const
 {
     MeasureBeat measureBeat;
 
-    int dummy = 0;
-
     if (score() && score()->checkHasMeasures()) {
+        int dummy = 0;
         score()->sigmap()->tickValues(tick, &measureBeat.measureIndex, &measureBeat.beatIndex, &dummy);
 
         measureBeat.maxMeasureIndex = score()->measures()->size() - 1;
-        measureBeat.maxBeatIndex = 4; // TODO
+        measureBeat.maxBeatIndex = score()->sigmap()->timesig(Fraction::fromTicks(tick)).timesig().numerator() - 1;
     }
 
     return measureBeat;

diff --git a/src/notation/internal/notationplayback.h b/src/notation/internal/notationplayback.h
@@ -60,7 +60,8 @@ class NotationPlayback : public INotationPlayback, public async::Asyncable
 
     midi::MidiData playElementMidiData(const Element* element) const override;
 
-    void addLoopBoundaryToSelectedNote(LoopBoundaryType boundaryType) override;
+    void addLoopBoundary(LoopBoundaryType boundaryType, int tick) override;
+    void removeLoopBoundary() override;
     async::Channel<LoopBoundary> loopBoundaryChanged() const override;
 
     Tempo tempo(int tick) const override;
@@ -88,8 +89,8 @@ class NotationPlayback : public INotationPlayback, public async::Asyncable
     midi::MidiData playChordMidiData(const Ms::Chord* chord) const;
     midi::MidiData playHarmonyMidiData(const Ms::Harmony* harmony) const;
 
-    void addLoopInToSelectedNote();
-    void addLoopOutToSelectedNote();
+    void addLoopIn(int tick);
+    void addLoopOut(int tick);
     QRect loopBoundaryRectByTick(LoopBoundaryType boundaryType, int tick) const;
 
     IGetScore* m_getScore = nullptr;

diff --git a/src/notation/notationmodule.cpp b/src/notation/notationmodule.cpp
@@ -63,7 +63,7 @@
 #include "view/widgets/selectdialog.h"
 #include "view/widgets/tupletdialog.h"
 #include "view/notationcontextmenu.h"
-#include "view/undoredomodel.h"
+#include "view/internal/undoredomodel.h"
 
 using namespace mu::notation;
 using namespace mu::framework;

diff --git a/src/notation/notationtypes.h b/src/notation/notationtypes.h
@@ -338,6 +338,11 @@ struct LoopBoundary
 
     QRect loopInRect;
     QRect loopOutRect;
+
+    bool isNull() const
+    {
+        return loopInTick == 0 && loopOutTick == 0;
+    }
 };
 
 inline QString staffTypeToString(StaffType type)

diff --git a/src/notation/view/internal/undoredomodel.cpp b/src/notation/view/internal/undoredomodel.cpp
@@ -2,7 +2,7 @@
 //  MuseScore
 //  Music Composition & Notation
 //
-//  Copyright (C) 2020 MuseScore BVBA and others
+//  Copyright (C) 2021 MuseScore BVBA and others
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License version 2.
@@ -25,7 +25,7 @@ using namespace mu::notation;
 using namespace mu::actions;
 using namespace mu::uicomponents;
 
-UndoRedoModel::UndoRedoModel(QObject *parent)
+UndoRedoModel::UndoRedoModel(QObject* parent)
     : QObject(parent)
 {
 }

diff --git a/src/notation/view/internal/undoredomodel.h b/src/notation/view/internal/undoredomodel.h
@@ -2,7 +2,7 @@
 //  MuseScore
 //  Music Composition & Notation
 //
-//  Copyright (C) 2020 MuseScore BVBA and others
+//  Copyright (C) 2021 MuseScore BVBA and others
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License version 2.

diff --git a/src/notation/view/notationpaintview.cpp b/src/notation/view/notationpaintview.cpp
@@ -225,8 +225,8 @@ void NotationPaintView::updateLoopMarkers(const LoopBoundary& boundary)
     m_loopInMarker->setRect(boundary.loopInRect);
     m_loopOutMarker->setRect(boundary.loopOutRect);
 
-    m_loopInMarker->setVisible(true);
-    m_loopOutMarker->setVisible(true);
+    m_loopInMarker->setVisible(!boundary.isNull());
+    m_loopOutMarker->setVisible(!boundary.isNull());
 
     update();
 }

diff --git a/src/notation/view/undoredomodel.cpp b/src/notation/view/undoredomodel.cpp
diff --git a/src/notation/view/undoredomodel.h b/src/notation/view/undoredomodel.h
diff --git a/src/palette/qml/MuseScore/Palette/internal/PalettesListPopup.qml b/src/palette/qml/MuseScore/Palette/internal/PalettesListPopup.qml
@@ -125,7 +125,6 @@ StyledPopup {
                         Layout.preferredWidth: width
 
                         icon: IconCode.PLUS
-                        hint: addButton.ToolTip.text
 
                         hint: qsTrc("palette", "Add %1 palette").arg(model.display)
                         Accessible.description: ToolTip.text