Merge pull request #20139 from miiizen/17625-fb-parts

Add figured bass to parts & score

src/engraving/dom/edit.cpp

@@ -5873,7 +5873,8 @@ void Score::undoAddElement(EngravingItem* element, bool addToLinkedStaves, bool
             && et != ElementType::FRET_DIAGRAM
             && et != ElementType::FERMATA
             && et != ElementType::HARMONY
-            && et != ElementType::HARP_DIAGRAM)
+            && et != ElementType::HARP_DIAGRAM
+            && et != ElementType::FIGURED_BASS)
         ) {
         undo(new AddElement(element));
         return;
@@ -6076,7 +6077,8 @@ void Score::undoAddElement(EngravingItem* element, bool addToLinkedStaves, bool
                      || element->isFretDiagram()
                      || element->isFermata()
                      || element->isHarmony()
-                     || element->isHarpPedalDiagram()) {
+                     || element->isHarpPedalDiagram()
+                     || element->isFiguredBass()) {
                 Segment* segment
                     = element->explicitParent()->isFretDiagram() ? toSegment(element->explicitParent()->explicitParent()) : toSegment(
                           element->explicitParent());

src/engraving/dom/engravingobject.h

@@ -78,6 +78,7 @@ class FBox;
 class FSymbol;
 class Fermata;
 class FiguredBass;
+class FiguredBassItem;
 class Fingering;
 class FretDiagram;
 class Glissando;
@@ -424,6 +425,7 @@ class EngravingObject
     CONVERT(LyricsLine,    LYRICSLINE)
     CONVERT(LyricsLineSegment, LYRICSLINE_SEGMENT)
     CONVERT(FiguredBass,   FIGURED_BASS)
+    CONVERT(FiguredBassItem, FIGURED_BASS_ITEM)
     CONVERT(StaffState,    STAFF_STATE)
     CONVERT(Arpeggio,      ARPEGGIO)
     CONVERT(Image,         IMAGE)
@@ -799,6 +801,7 @@ CONVERT(NoteHead)
 CONVERT(LyricsLine)
 CONVERT(LyricsLineSegment)
 CONVERT(FiguredBass)
+CONVERT(FiguredBassItem)
 CONVERT(StaffState)
 CONVERT(Arpeggio)
 CONVERT(Image)

src/engraving/dom/figuredbass.cpp

@@ -30,11 +30,13 @@
 
 #include "chord.h"
 #include "factory.h"
+#include "linkedobjects.h"
 #include "measure.h"
 #include "note.h"
 #include "rest.h"
 #include "score.h"
 #include "segment.h"
+#include "undo.h"
 
 #include "log.h"
 
@@ -78,7 +80,7 @@ const Char FiguredBassItem::NORM_PARENTH_TO_CHAR[int(FiguredBassItem::Parenthesi
 { 0, '(', ')', '[', ']' };
 
 FiguredBassItem::FiguredBassItem(FiguredBass* parent, int l)
-    : EngravingItem(ElementType::INVALID, parent), m_ord(l)
+    : EngravingItem(ElementType::FIGURED_BASS_ITEM, parent), m_ord(l)
 {
     m_prefix     = m_suffix = Modifier::NONE;
     m_digit      = FBIDigitNone;
@@ -706,8 +708,7 @@ Sid FiguredBass::getPropertyStyle(Pid id) const
 
 void FiguredBass::startEdit(EditData& ed)
 {
-    DeleteAll(m_items);
-    m_items.clear();
+    clearItems();
     renderer()->layoutText1(this);   // re-layout without F.B.-specific formatting.
     TextBase::startEdit(ed);
 }
@@ -728,6 +729,11 @@ bool FiguredBass::isEditAllowed(EditData& ed) const
 void FiguredBass::endEdit(EditData& ed)
 {
     TextBase::endEdit(ed);
+    regenerateText();
+}
+
+void FiguredBass::regenerateText()
+{
     // as the standard text editor keeps inserting spurious HTML formatting and styles
     // retrieve and work only on the plain text
     const String txt = plainText();
@@ -737,24 +743,20 @@ void FiguredBass::endEdit(EditData& ed)
 
     // split text into lines and create an item for each line
     StringList list = txt.split(u'\n', mu::SkipEmptyParts);
-    DeleteAll(m_items);
-    m_items.clear();
+    clearItems();
     String normalizedText;
     int idx = 0;
     for (String str : list) {
         FiguredBassItem* pItem = new FiguredBassItem(this, idx++);
         if (!pItem->parse(str)) {               // if any item fails parsing
-            DeleteAll(m_items);
-            m_items.clear();                      // clear item list
+            clearItems();
             score()->startCmd();
             triggerLayout();
             score()->endCmd();
             delete pItem;
             return;
         }
-        pItem->setTrack(track());
-        pItem->setParent(this);
-        m_items.push_back(pItem);
+        addItemToLinked(pItem);
 
         // add item normalized text
         if (!normalizedText.isEmpty()) {
@@ -764,7 +766,7 @@ void FiguredBass::endEdit(EditData& ed)
     }
     // if all items parsed and text is styled, replaced entered text with normalized text
     if (m_items.size()) {
-        setXmlText(normalizedText);
+        undoChangeProperty(Pid::TEXT, normalizedText);
     }
 
     score()->startCmd();
@@ -869,6 +871,13 @@ PropertyValue FiguredBass::getProperty(Pid propertyId) const
 bool FiguredBass::setProperty(Pid propertyId, const PropertyValue& v)
 {
     score()->addRefresh(canvasBoundingRect());
+    if (propertyId == Pid::TEXT_LINKED_TO_MASTER) {
+        if (TextBase::setProperty(propertyId, v)) {
+            regenerateText();
+            return true;
+        }
+        return false;
+    }
     return TextBase::setProperty(propertyId, v);
 }
 
@@ -877,6 +886,63 @@ PropertyValue FiguredBass::propertyDefault(Pid id) const
     return TextBase::propertyDefault(id);
 }
 
+void FiguredBass::clearItems()
+{
+    const std::list<EngravingObject*> links = linkList();
+    for (EngravingObject* linkedObject : links) {
+        if (!linkedObject || !linkedObject->isFiguredBass()) {
+            continue;
+        }
+        if (linkedObject == this) {
+            DeleteAll(m_items);
+            m_items.clear();
+        } else {
+            bool isThisTextLinked = getProperty(Pid::TEXT_LINKED_TO_MASTER).toBool();
+            bool isOtherTextLinked = linkedObject->getProperty(Pid::TEXT_LINKED_TO_MASTER).toBool();
+            if ((score()->isMaster() && !isOtherTextLinked)
+                || (!score()->isMaster() && !isThisTextLinked)) {
+                continue;
+            }
+            FiguredBass* linkedFb = toFiguredBass(linkedObject);
+            DeleteAll(linkedFb->m_items);
+            linkedFb->m_items.clear();
+        }
+    }
+}
+
+void FiguredBass::addItemToLinked(FiguredBassItem* item)
+{
+    const std::list<EngravingObject*> links = linkList();
+    for (EngravingObject* linkedObject : links) {
+        if (!linkedObject || !linkedObject->isFiguredBass()) {
+            continue;
+        }
+        Score* linkedScore = linkedObject->score();
+        if (linkedObject == this) {
+            item->setTrack(track());
+            item->setParent(this);
+            m_items.push_back(item);
+            score()->undo(new AddElement(item));
+        } else {
+            bool isThisTextLinked = getProperty(Pid::TEXT_LINKED_TO_MASTER).toBool();
+            bool isOtherTextLinked = linkedObject->getProperty(Pid::TEXT_LINKED_TO_MASTER).toBool();
+            if ((score()->isMaster() && !isOtherTextLinked)
+                || (!score()->isMaster() && !isThisTextLinked)) {
+                continue;
+            }
+            FiguredBass* linkedFb = toFiguredBass(linkedObject);
+            FiguredBassItem* itemClone = item->clone();
+
+            itemClone->linkTo(item);
+            itemClone->setTrack(linkedFb->track());
+            itemClone->setParent(linkedFb);
+            itemClone->setScore(linkedFb->score());
+            linkedFb->appendItem(itemClone);
+            linkedScore->undo(new AddElement(itemClone));
+        }
+    }
+}
+
 //---------------------------------------------------------
 //   STATIC FUNCTION
 //    adding a new FiguredBass to a Segment;
@@ -1182,7 +1248,7 @@ FiguredBass* Score::addFiguredBass()
     }
 
     FiguredBass* fb;
-    bool bNew;
+    bool bNew = true;
     if (el->isNote()) {
         ChordRest* cr = toNote(el)->chord();
         fb = FiguredBass::addFiguredBassToSegment(cr->segment(), cr->staffIdx() * VOICES, Fraction(0, 1), &bNew);

src/engraving/dom/figuredbass.h

@@ -91,6 +91,7 @@ class FiguredBass;
 class FiguredBassItem final : public EngravingItem
 {
     OBJECT_ALLOCATOR(engraving, FiguredBassItem)
+    DECLARE_CLASSOF(ElementType::FIGURED_BASS_ITEM)
 
 public:
     enum class Modifier : char {
@@ -275,6 +276,7 @@ class FiguredBass final : public TextBase
     void startEdit(EditData&) override;
     bool isEditAllowed(EditData&) const override;
     void endEdit(EditData&) override;
+    void regenerateText();
 
     bool onNote() const { return m_onNote; }
     void setOnNote(bool val) { m_onNote = val; }
@@ -292,6 +294,8 @@ class FiguredBass final : public TextBase
     size_t itemsCount() const { return m_items.size(); }
     void appendItem(FiguredBassItem* item) { m_items.push_back(item); }
     const std::vector<FiguredBassItem*>& items() const { return m_items; }
+    void clearItems();
+    void addItemToLinked(FiguredBassItem* item);
 
     // the array of configured fonts
     static const std::vector<FiguredBassFont>& FBFonts();

src/engraving/tests/parts_data/part-image-parts.mscx

@@ -126,7 +126,7 @@
               <linkedMain/>
               <Image>
                 <Image>
-                  <z>8499</z>
+                  <z>8599</z>
                   <path>71b2e9f575296b78c22ba721cd71f6e5.png</path>
                   <linkPath>schnee.png</linkPath>
                   </Image>
@@ -848,7 +848,7 @@
                   </linked>
                 <Image>
                   <Image>
-                    <z>8499</z>
+                    <z>8599</z>
                     <path>71b2e9f575296b78c22ba721cd71f6e5.png</path>
                     <linkPath>schnee.png</linkPath>
                     </Image>

src/engraving/tests/parts_data/part-image-udel.mscx

@@ -126,7 +126,7 @@
               <linkedMain/>
               <Image>
                 <Image>
-                  <z>8499</z>
+                  <z>8599</z>
                   <path>71b2e9f575296b78c22ba721cd71f6e5.png</path>
                   <linkPath>schnee.png</linkPath>
                   </Image>
@@ -849,7 +849,7 @@
                   </linked>
                 <Image>
                   <Image>
-                    <z>8499</z>
+                    <z>8599</z>
                     <path>71b2e9f575296b78c22ba721cd71f6e5.png</path>
                     <linkPath>schnee.png</linkPath>
                     </Image>

src/engraving/tests/parts_data/part-image.mscx

@@ -122,7 +122,7 @@
             <Note>
               <Image>
                 <Image>
-                  <z>8499</z>
+                  <z>8599</z>
                   <path>71b2e9f575296b78c22ba721cd71f6e5.png</path>
                   <linkPath>schnee.png</linkPath>
                   </Image>

src/engraving/types/types.h

@@ -107,6 +107,7 @@ enum class ElementType {
     HOOK,
     LYRICS,
     FIGURED_BASS,
+    FIGURED_BASS_ITEM,
     MARKER,
     JUMP,
     FINGERING,

src/engraving/types/typesconv.cpp

@@ -202,6 +202,7 @@ static const std::vector<Item<ElementType> > ELEMENT_TYPES = {
     { ElementType::HOOK,                 "Hook",                 TranslatableString("engraving", "Flag") }, // internally called "Hook", but "Flag" in SMuFL, so here externally too
     { ElementType::LYRICS,               "Lyrics",               TranslatableString("engraving", "Lyrics") },
     { ElementType::FIGURED_BASS,         "FiguredBass",          TranslatableString("engraving", "Figured bass") },
+    { ElementType::FIGURED_BASS_ITEM,    "FiguredBassItem",      TranslatableString("engraving", "Figured bass item") },
     { ElementType::MARKER,               "Marker",               TranslatableString("engraving", "Marker") },
     { ElementType::JUMP,                 "Jump",                 TranslatableString("engraving", "Jump") },
     { ElementType::FINGERING,            "Fingering",            TranslatableString("engraving", "Fingering") },