diff --git a/src/engraving/dom/cmd.cpp b/src/engraving/dom/cmd.cpp index 1d81fa25245bf..0d4110e05a013 100644 --- a/src/engraving/dom/cmd.cpp +++ b/src/engraving/dom/cmd.cpp @@ -5009,7 +5009,7 @@ bool Score::resolveNoteInputParams(int note, bool addFlag, NoteInputParams& out) // cmdAddPitch /// insert note or add note to chord //--------------------------------------------------------- -void Score::cmdAddPitch(const EditData& ed, const NoteInputParams& params, bool addFlag, bool insert) +void Score::cmdAddPitch(const NoteInputParams& params, bool addFlag, bool insert) { InputState& is = inputState(); if (!is.isValid()) { @@ -5041,8 +5041,6 @@ void Score::cmdAddPitch(const EditData& ed, const NoteInputParams& params, bool } cmdAddPitch(params.step, addFlag, insert); - - ed.view()->adjustCanvasPosition(is.cr()); } void Score::cmdAddPitch(int step, bool addFlag, bool insert) diff --git a/src/engraving/dom/mscoreview.h b/src/engraving/dom/mscoreview.h index 67c06a7c8d615..6e5b90db9ddbd 100644 --- a/src/engraving/dom/mscoreview.h +++ b/src/engraving/dom/mscoreview.h @@ -23,21 +23,17 @@ #ifndef MU_ENGRAVING_MSCOREVIEW_H #define MU_ENGRAVING_MSCOREVIEW_H -#include - -#include "draw/painter.h" - #include "../types/types.h" +namespace muse::draw { +class Painter; +} + namespace mu::engraving { class EngravingItem; class Page; class Score; -//--------------------------------------------------------- -// MuseScoreView -//--------------------------------------------------------- - class MuseScoreView { public: @@ -62,8 +58,6 @@ class MuseScoreView virtual void textTab(bool /*back*/) {} - virtual const muse::Rect geometry() const = 0; - const std::vector elementsAt(const PointF&) const; EngravingItem* elementNear(const PointF& pos) const; virtual void adjustCanvasPosition(const EngravingItem*, int /*staffIdx*/ = -1) {} diff --git a/src/engraving/dom/score.h b/src/engraving/dom/score.h index 89467368664a1..62f7eb3e12605 100644 --- a/src/engraving/dom/score.h +++ b/src/engraving/dom/score.h @@ -355,7 +355,7 @@ class Score : public EngravingObject, public muse::Injectable bool resolveNoteInputParams(int noteIdx, bool addFlag, NoteInputParams& out) const; - void cmdAddPitch(const EditData&, const NoteInputParams& params, bool addFlag, bool insert); + void cmdAddPitch(const NoteInputParams& params, bool addFlag, bool insert); void cmdAddPitch(int note, bool addFlag, bool insert); void cmdAddStretch(double); diff --git a/src/notation/internal/notationnoteinput.cpp b/src/notation/internal/notationnoteinput.cpp index 4605047ba0c99..014f660a787d7 100644 --- a/src/notation/internal/notationnoteinput.cpp +++ b/src/notation/internal/notationnoteinput.cpp @@ -36,7 +36,6 @@ #include "engraving/dom/utils.h" #include "mscoreerrorscontroller.h" -#include "scorecallbacks.h" #include "log.h" @@ -57,9 +56,6 @@ NotationNoteInput::NotationNoteInput(const IGetScore* getScore, INotationInterac , const modularity::ContextPtr& iocCtx) : muse::Injectable(iocCtx), m_getScore(getScore), m_interaction(interaction), m_undoStack(undoStack) { - m_scoreCallbacks = new ScoreCallbacks(); - m_scoreCallbacks->setNotationInteraction(interaction); - m_interaction->selectionChanged().onNotify(this, [this]() { if (!isNoteInputMode()) { updateInputState(); @@ -74,11 +70,6 @@ NotationNoteInput::NotationNoteInput(const IGetScore* getScore, INotationInterac }); } -NotationNoteInput::~NotationNoteInput() -{ - delete m_scoreCallbacks; -} - bool NotationNoteInput::isNoteInputMode() const { return score()->inputState().noteEntryMode(); @@ -430,13 +421,11 @@ void NotationNoteInput::addNote(const NoteInputParams& params, NoteAddingMode ad { TRACEFUNC; - mu::engraving::EditData editData(m_scoreCallbacks); - startEdit(TranslatableString("undoableAction", "Enter note")); bool addToUpOnCurrentChord = addingMode == NoteAddingMode::CurrentChord; bool insertNewChord = addingMode == NoteAddingMode::InsertChord; - score()->cmdAddPitch(editData, params, addToUpOnCurrentChord, insertNewChord); + score()->cmdAddPitch(params, addToUpOnCurrentChord, insertNewChord); apply(); @@ -448,6 +437,8 @@ void NotationNoteInput::addNote(const NoteInputParams& params, NoteAddingMode ad notifyAboutStateChanged(); MScoreErrorsController(iocContext()).checkAndShowMScoreError(); + + m_interaction->showItem(state().cr()); } void NotationNoteInput::padNote(const Pad& pad) diff --git a/src/notation/internal/notationnoteinput.h b/src/notation/internal/notationnoteinput.h index 721632f4e6d3f..040d06d4b18d7 100644 --- a/src/notation/internal/notationnoteinput.h +++ b/src/notation/internal/notationnoteinput.h @@ -37,7 +37,6 @@ class Score; } namespace mu::notation { -class ScoreCallbacks; class NotationNoteInput : public INotationNoteInput, public muse::Injectable, public muse::async::Asyncable { muse::Inject configuration = { this }; @@ -45,7 +44,6 @@ class NotationNoteInput : public INotationNoteInput, public muse::Injectable, pu public: NotationNoteInput(const IGetScore* getScore, INotationInteraction* interaction, INotationUndoStackPtr undoStack, const muse::modularity::ContextPtr& iocCtx); - ~NotationNoteInput() override; bool isNoteInputMode() const override; @@ -121,7 +119,6 @@ class NotationNoteInput : public INotationNoteInput, public muse::Injectable, pu muse::async::Channel m_noteInputStarted; muse::async::Notification m_noteInputEnded; - ScoreCallbacks* m_scoreCallbacks = nullptr; std::function m_getViewRectFunc; }; } diff --git a/src/notation/internal/scorecallbacks.cpp b/src/notation/internal/scorecallbacks.cpp index b4335a10a171f..59984f32d6d52 100644 --- a/src/notation/internal/scorecallbacks.cpp +++ b/src/notation/internal/scorecallbacks.cpp @@ -22,11 +22,7 @@ #include "scorecallbacks.h" #include "engraving/dom/engravingitem.h" -#include "engraving/dom/lyrics.h" -#include "engraving/dom/system.h" - #include "inotationinteraction.h" -#include "igetscore.h" #include "log.h" @@ -47,12 +43,6 @@ void ScoreCallbacks::drawBackground(muse::draw::Painter*, const muse::RectF&) co NOT_IMPLEMENTED; } -const muse::Rect ScoreCallbacks::geometry() const -{ - NOT_IMPLEMENTED; - return muse::Rect(); -} - qreal ScoreCallbacks::selectionProximity() const { return m_selectionProximity; diff --git a/src/notation/internal/scorecallbacks.h b/src/notation/internal/scorecallbacks.h index 9f9654081fcc7..5faa0613abf58 100644 --- a/src/notation/internal/scorecallbacks.h +++ b/src/notation/internal/scorecallbacks.h @@ -24,23 +24,16 @@ #include "engraving/dom/mscoreview.h" -#include "notation/inotationconfiguration.h" -#include "modularity/ioc.h" - namespace mu::notation { class INotationInteraction; -class IGetScore; class ScoreCallbacks : public mu::engraving::MuseScoreView { - INJECT(INotationConfiguration, configuration) - public: ScoreCallbacks() = default; void dataChanged(const muse::RectF&) override; void updateAll() override; void drawBackground(muse::draw::Painter*, const muse::RectF&) const override; - const muse::Rect geometry() const override; qreal selectionProximity() const override; void setDropTarget(mu::engraving::EngravingItem* dropTarget) override; void setDropRectangle(const muse::RectF& rect) override; diff --git a/src/notation/view/widgets/exampleview.cpp b/src/notation/view/widgets/exampleview.cpp index 4c205e8c6bbd7..ee5824e4c4b6f 100644 --- a/src/notation/view/widgets/exampleview.cpp +++ b/src/notation/view/widgets/exampleview.cpp @@ -137,10 +137,6 @@ void ExampleView::setDropRectangle(const RectF&) { } -void ExampleView::cmdAddSlur(Note* /*firstNote*/, Note* /*lastNote*/) -{ -} - void ExampleView::drawBackground(Painter* p, const RectF& r) const { if (m_backgroundPixmap == 0 || m_backgroundPixmap->isNull()) { diff --git a/src/notation/view/widgets/exampleview.h b/src/notation/view/widgets/exampleview.h index 1199b48f5945a..782390ce7d59f 100644 --- a/src/notation/view/widgets/exampleview.h +++ b/src/notation/view/widgets/exampleview.h @@ -66,10 +66,8 @@ class ExampleView : public QFrame, public engraving::MuseScoreView, public muse: void changeEditElement(engraving::EngravingItem*) override; void setDropRectangle(const muse::RectF&) override; - void cmdAddSlur(engraving::Note* firstNote, Note* lastNote); void drawBackground(muse::draw::Painter*, const muse::RectF&) const override; void dragExampleView(QMouseEvent* ev); - const muse::Rect geometry() const override { return muse::Rect(QFrame::geometry()); } protected: void mousePressEvent(QMouseEvent*) override;