Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the NoteLine element #24993

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −141
Open

Remove the NoteLine element #24993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/engraving/api/v1/apitypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ enum class ElementType {
HARMONIC_MARK = int(mu::engraving::ElementType::HARMONIC_MARK),
TEXTLINE = int(mu::engraving::ElementType::TEXTLINE),
TEXTLINE_BASE = int(mu::engraving::ElementType::TEXTLINE_BASE),
NOTELINE = int(mu::engraving::ElementType::NOTELINE),
LYRICSLINE = int(mu::engraving::ElementType::LYRICSLINE),
GLISSANDO = int(mu::engraving::ElementType::GLISSANDO),
BRACKET = int(mu::engraving::ElementType::BRACKET),
Expand Down
2 changes: 0 additions & 2 deletions src/engraving/dom/dom.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ set(DOM_SRC
${CMAKE_CURRENT_LIST_DIR}/noteentry.cpp
${CMAKE_CURRENT_LIST_DIR}/noteevent.cpp
${CMAKE_CURRENT_LIST_DIR}/noteevent.h
${CMAKE_CURRENT_LIST_DIR}/noteline.cpp
${CMAKE_CURRENT_LIST_DIR}/noteline.h
${CMAKE_CURRENT_LIST_DIR}/notifier.h
${CMAKE_CURRENT_LIST_DIR}/ornament.cpp
${CMAKE_CURRENT_LIST_DIR}/ornament.h
Expand Down
4 changes: 0 additions & 4 deletions src/engraving/dom/engravingobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ class MStyle;
class Note;
class NoteDot;
class NoteHead;
class NoteLine;
class Ornament;
class Ottava;
class OttavaSegment;
Expand Down Expand Up @@ -389,7 +388,6 @@ class EngravingObject
CONVERT(LedgerLine, LEDGER_LINE)
CONVERT(ActionIcon, ACTION_ICON)
CONVERT(VoltaSegment, VOLTA_SEGMENT)
CONVERT(NoteLine, NOTELINE)
CONVERT(Trill, TRILL)
CONVERT(TrillSegment, TRILL_SEGMENT)
CONVERT(LetRing, LET_RING)
Expand Down Expand Up @@ -494,7 +492,6 @@ class EngravingObject
return isHairpin()
|| isLetRing()
|| isGradualTempoChange()
|| isNoteLine()
|| isOttava()
|| isPalmMute()
|| isWhammyBar()
Expand Down Expand Up @@ -768,7 +765,6 @@ CONVERT(OttavaSegment)
CONVERT(LedgerLine)
CONVERT(ActionIcon)
CONVERT(VoltaSegment)
CONVERT(NoteLine)
CONVERT(Trill)
CONVERT(TrillSegment)
CONVERT(LetRing)
Expand Down
2 changes: 0 additions & 2 deletions src/engraving/dom/factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
#include "mmrest.h"
#include "mmrestrange.h"
#include "note.h"
#include "noteline.h"
#include "ornament.h"
#include "ottava.h"
#include "page.h"
Expand Down Expand Up @@ -138,7 +137,6 @@ EngravingItem* Factory::doCreateItem(ElementType type, EngravingItem* parent)
case ElementType::VOLTA: return new Volta(parent);
case ElementType::OTTAVA: return new Ottava(parent);
case ElementType::TEXTLINE: return new TextLine(parent);
case ElementType::NOTELINE: return new NoteLine(parent);
case ElementType::TRILL: return new Trill(parent);
case ElementType::LET_RING: return new LetRing(parent);
case ElementType::GRADUAL_TEMPO_CHANGE: return new GradualTempoChange(parent);
Expand Down
48 changes: 0 additions & 48 deletions src/engraving/dom/noteline.cpp
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src/engraving/dom/noteline.h
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/engraving/dom/select.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ bool SelectionFilter::canSelect(const EngravingItem* e) const
if (e->isTextBase()) { // only TEXT, INSTRCHANGE and STAFFTEXT are caught here, rest are system thus not in selection
return isFiltered(SelectionFilterType::OTHER_TEXT);
}
if (e->isSLine()) { // NoteLine, Volta
if (e->isSLine()) { // Volta
return isFiltered(SelectionFilterType::OTHER_LINE);
}
if (e->type() == ElementType::TREMOLO_TWOCHORD) {
Expand Down Expand Up @@ -1062,7 +1062,6 @@ muse::ByteArray Selection::symbolListMimeData() const
case ElementType::PEDAL:
case ElementType::TRILL:
case ElementType::TEXTLINE:
case ElementType::NOTELINE:
case ElementType::SEGMENT:
case ElementType::SYSTEM:
case ElementType::COMPOUND:
Expand Down
3 changes: 1 addition & 2 deletions src/engraving/rw/read400/tread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
#include "../../dom/bracket.h"
#include "../../dom/breath.h"
#include "../../dom/note.h"
#include "../../dom/noteline.h"
#include "../../dom/spanner.h"
#include "../../dom/fingering.h"
#include "../../dom/notedot.h"
Expand Down Expand Up @@ -157,7 +156,7 @@ using ReadTypes = rtti::TypeList<Accidental, ActionIcon, Ambitus, Arpeggio, Arti
KeySig,
LayoutBreak, LedgerLine, LetRing, Lyrics,
Marker, MeasureNumber, MeasureRepeat, MMRest, MMRestRange,
Note, NoteDot, NoteHead, NoteLine,
Note, NoteDot, NoteHead,
Page, PalmMute, Pedal, PlayTechAnnotation,
Rasgueado, RehearsalMark, Rest,
Ornament, Ottava,
Expand Down
3 changes: 0 additions & 3 deletions src/engraving/rw/read410/tread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
#include "../../dom/bracket.h"
#include "../../dom/breath.h"
#include "../../dom/note.h"
#include "../../dom/noteline.h"
#include "../../dom/spanner.h"
#include "../../dom/fingering.h"
#include "../../dom/notedot.h"
Expand Down Expand Up @@ -253,8 +252,6 @@ void TRead::readItem(EngravingItem* item, XmlReader& xml, ReadContext& ctx)
break;
case ElementType::NOTEHEAD: read(item_cast<NoteHead*>(item), xml, ctx);
break;
case ElementType::NOTELINE: read(item_cast<NoteLine*>(item), xml, ctx);
break;
case ElementType::PAGE: read(item_cast<Page*>(item), xml, ctx);
break;
case ElementType::PALM_MUTE: read(item_cast<PalmMute*>(item), xml, ctx);
Expand Down
13 changes: 0 additions & 13 deletions src/engraving/rw/write/twrite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@

#include "dom/note.h"
#include "dom/notedot.h"
#include "dom/noteline.h"
#include "dom/ornament.h"
#include "dom/ottava.h"

Expand Down Expand Up @@ -269,8 +268,6 @@ void TWrite::writeItem(const EngravingItem* item, XmlWriter& xml, WriteContext&
break;
case ElementType::NOTEHEAD: write(item_cast<const NoteHead*>(item), xml, ctx);
break;
case ElementType::NOTELINE: write(item_cast<const NoteLine*>(item), xml, ctx);
break;
case ElementType::ORNAMENT: write(item_cast<const Ornament*>(item), xml, ctx);
break;
case ElementType::OTTAVA: write(item_cast<const Ottava*>(item), xml, ctx);
Expand Down Expand Up @@ -2278,16 +2275,6 @@ void TWrite::write(const NoteHead* item, XmlWriter& xml, WriteContext& ctx)
write(static_cast<const Symbol*>(item), xml, ctx);
}

void TWrite::write(const NoteLine* item, XmlWriter& xml, WriteContext& ctx)
{
if (!ctx.canWrite(item)) {
return;
}
xml.startElement(item);
writeProperties(static_cast<const TextLineBase*>(item), xml, ctx);
xml.endElement();
}

void TWrite::write(const Ottava* item, XmlWriter& xml, WriteContext& ctx)
{
if (!ctx.canWrite(item)) {
Expand Down
2 changes: 0 additions & 2 deletions src/engraving/rw/write/twrite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ class Note;
class NoteEvent;
class NoteDot;
class NoteHead;
class NoteLine;
class Ornament;
class Ottava;

Expand Down Expand Up @@ -250,7 +249,6 @@ class TWrite
static void write(const NoteEvent* item, XmlWriter& xml, WriteContext& ctx);
static void write(const NoteDot* item, XmlWriter& xml, WriteContext& ctx);
static void write(const NoteHead* item, XmlWriter& xml, WriteContext& ctx);
static void write(const NoteLine* item, XmlWriter& xml, WriteContext& ctx);
static void write(const Ornament* item, XmlWriter& xml, WriteContext& ctx);
static void write(const Ottava* item, XmlWriter& xml, WriteContext& ctx);

Expand Down
1 change: 0 additions & 1 deletion src/engraving/types/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ enum class ElementType {
PICK_SCRAPE,
TEXTLINE,
TEXTLINE_BASE,
NOTELINE,
LYRICSLINE,
GLISSANDO,
BRACKET,
Expand Down
1 change: 0 additions & 1 deletion src/engraving/types/typesconv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ static const std::vector<Item<ElementType> > ELEMENT_TYPES = {
{ ElementType::PICK_SCRAPE, "PickScrape", muse::TranslatableString("engraving", "Pick scrape out") },
{ ElementType::TEXTLINE, "TextLine", muse::TranslatableString("engraving", "Text line") },
{ ElementType::TEXTLINE_BASE, "TextLineBase", muse::TranslatableString("engraving", "Text line base") }, // remove
{ ElementType::NOTELINE, "NoteLine", muse::TranslatableString("engraving", "Note line") },
{ ElementType::LYRICSLINE, "LyricsLine", muse::TranslatableString("engraving", "Extension line") },
{ ElementType::GLISSANDO, "Glissando", muse::TranslatableString("engraving", "Glissando") },
{ ElementType::BRACKET, "Bracket", muse::TranslatableString("engraving", "Bracket") },
Expand Down
1 change: 0 additions & 1 deletion src/inspector/models/abstractinspectormodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ static const QMap<mu::engraving::ElementType, InspectorModelType> NOTATION_ELEME
{ mu::engraving::ElementType::STEM, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::NOTEDOT, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::NOTEHEAD, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::NOTELINE, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::SHADOW_NOTE, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::HOOK, InspectorModelType::TYPE_NOTE },
{ mu::engraving::ElementType::BEAM, InspectorModelType::TYPE_NOTE },
Expand Down