Merge branch 'develop' into regex-performance

rism-digital · Dec 16, 2024 · a714c84 · a714c84
2 parents fdae6f6 + 7546476
commit a714c84
Show file tree

Hide file tree

Showing 44 changed files with 191 additions and 385 deletions.
diff --git a/include/vrv/arpeg.h b/include/vrv/arpeg.h
@@ -28,7 +28,6 @@ class Arpeg : public ControlElement,
               public TimePointInterface,
               public AttArpegLog,
               public AttArpegVis,
-              public AttColor,
               public AttEnclosingChars {
 public:
     /**

diff --git a/include/vrv/beamspan.h b/include/vrv/beamspan.h
@@ -33,8 +33,7 @@ class BeamSpan : public ControlElement,
                  public PlistInterface,
                  public TimeSpanningInterface,
                  public AttBeamedWith,
-                 public AttBeamRend,
-                 public AttColor {
+                 public AttBeamRend {
 public:
     /**
      * @name Constructors, destructors, and other standard methods

diff --git a/include/vrv/bracketspan.h b/include/vrv/bracketspan.h
@@ -24,7 +24,6 @@ namespace vrv {
 class BracketSpan : public ControlElement,
                     public TimeSpanningInterface,
                     public AttBracketSpanLog,
-                    public AttColor,
                     public AttLineRend,
                     public AttLineRendBase {
 public:

diff --git a/include/vrv/breath.h b/include/vrv/breath.h
@@ -21,7 +21,7 @@ namespace vrv {
 /**
  * This class models the MEI <breath> element.
  */
-class Breath : public ControlElement, public TimePointInterface, public AttColor, public AttPlacementRelStaff {
+class Breath : public ControlElement, public TimePointInterface, public AttPlacementRelStaff {
 public:
     /**
      * @name Constructors, destructors, and other standard methods

diff --git a/include/vrv/caesura.h b/include/vrv/caesura.h
@@ -24,7 +24,6 @@ namespace vrv {
  */
 class Caesura : public ControlElement,
                 public TimePointInterface,
-                public AttColor,
                 public AttExtSymAuth,
                 public AttExtSymNames,
                 public AttPlacementRelStaff {

diff --git a/include/vrv/controlelement.h b/include/vrv/controlelement.h
@@ -10,6 +10,7 @@
 
 #include "altsyminterface.h"
 #include "atts_shared.h"
+#include "atts_visual.h"
 #include "devicecontextbase.h"
 #include "floatingobject.h"
 #include "linkinginterface.h"
@@ -27,6 +28,7 @@ namespace vrv {
 class ControlElement : public FloatingObject,
                        public AltSymInterface,
                        public LinkingInterface,
+                       public AttColor,
                        public AttLabelled,
                        public AttTyped {
 public:

diff --git a/include/vrv/editortoolkit_neume.h b/include/vrv/editortoolkit_neume.h
@@ -41,7 +41,7 @@ class EditorToolkitNeume : public EditorToolkit {
     ///@{
     bool Chain(jsonxx::Array actions);
     bool DisplaceClefOctave(std::string elementId, std::string direction);
-    bool Drag(std::string elementId, int x, int y);
+    bool Drag(std::string elementId, int x, int y, bool topLevel = true);
     bool Insert(std::string elementType, std::string staffId, int ulx, int uly, int lrx, int lry,
         std::vector<std::pair<std::string, std::string>> attributes);
     bool InsertToSyllable(std::string elementId);
@@ -102,7 +102,8 @@ class EditorToolkitNeume : public EditorToolkit {
      * Helper functions for editor actions.
      */
     ///@{
-    bool AdjustPitchFromPosition(Object *obj, Clef *clef = NULL);
+    bool AdjustPitchAfterDrag(Object *obj, int y = 0);
+    bool AdjustPitchFromPosition(Object *obj);
     bool AdjustClefLineFromPosition(Clef *clef, Staff *staff = NULL);
     ///@}
 };

diff --git a/include/vrv/fermata.h b/include/vrv/fermata.h
@@ -25,7 +25,6 @@ namespace vrv {
  */
 class Fermata : public ControlElement,
                 public TimePointInterface,
-                public AttColor,
                 public AttEnclosingChars,
                 public AttExtSymAuth,
                 public AttExtSymNames,

diff --git a/include/vrv/gliss.h b/include/vrv/gliss.h
@@ -23,7 +23,6 @@ namespace vrv {
  */
 class Gliss : public ControlElement,
               public TimeSpanningInterface,
-              public AttColor,
               public AttLineRend,
               public AttLineRendBase,
               public AttNNumberLike {

diff --git a/include/vrv/hairpin.h b/include/vrv/hairpin.h
@@ -24,7 +24,6 @@ namespace vrv {
  */
 class Hairpin : public ControlElement,
                 public TimeSpanningInterface,
-                public AttColor,
                 public AttHairpinLog,
                 public AttHairpinVis,
                 public AttLineRendBase,

diff --git a/include/vrv/mnum.h b/include/vrv/mnum.h
@@ -27,7 +27,6 @@ class MNum : public ControlElement,
              public TextListInterface,
              public TextDirInterface,
              public TimePointInterface,
-             public AttColor,
              public AttLang,
              public AttTypography {
 public:

diff --git a/include/vrv/mordent.h b/include/vrv/mordent.h
@@ -25,7 +25,6 @@ namespace vrv {
  */
 class Mordent : public ControlElement,
                 public TimePointInterface,
-                public AttColor,
                 public AttExtSymAuth,
                 public AttExtSymNames,
                 public AttOrnamentAccid,

diff --git a/include/vrv/octave.h b/include/vrv/octave.h
@@ -24,7 +24,6 @@ namespace vrv {
  */
 class Octave : public ControlElement,
                public TimeSpanningInterface,
-               public AttColor,
                public AttExtender,
                public AttLineRend,
                public AttLineRendBase,

diff --git a/include/vrv/ornam.h b/include/vrv/ornam.h
@@ -28,7 +28,6 @@ class Ornam : public ControlElement,
               public TextListInterface,
               public TextDirInterface,
               public TimePointInterface,
-              public AttColor,
               public AttOrnamentAccid {
 public:
     /**

diff --git a/include/vrv/pedal.h b/include/vrv/pedal.h
@@ -26,7 +26,6 @@ class System;
  */
 class Pedal : public ControlElement,
               public TimeSpanningInterface,
-              public AttColor,
               public AttExtSymAuth,
               public AttExtSymNames,
               public AttPedalLog,

diff --git a/include/vrv/reh.h b/include/vrv/reh.h
@@ -26,7 +26,6 @@ class TextElement;
 class Reh : public ControlElement,
             public TextDirInterface,
             public TimePointInterface,
-            public AttColor,
             public AttLang,
             public AttVerticalGroup {
 public:

diff --git a/include/vrv/repeatmark.h b/include/vrv/repeatmark.h
@@ -27,7 +27,6 @@ class RepeatMark : public ControlElement,
                    public TextListInterface,
                    public TextDirInterface,
                    public TimePointInterface,
-                   public AttColor,
                    public AttExtSymAuth,
                    public AttExtSymNames,
                    public AttRepeatMarkLog {

diff --git a/include/vrv/slur.h b/include/vrv/slur.h
@@ -52,7 +52,6 @@ enum class PortatoSlurType { None, StemSide, Centered };
 
 class Slur : public ControlElement,
              public TimeSpanningInterface,
-             public AttColor,
              public AttCurvature,
              public AttLayerIdent,
              public AttLineRendBase {

diff --git a/include/vrv/tie.h b/include/vrv/tie.h
@@ -24,11 +24,7 @@ class Note;
 /**
  * This class models the MEI <tie> element.
  */
-class Tie : public ControlElement,
-            public TimeSpanningInterface,
-            public AttColor,
-            public AttCurvature,
-            public AttLineRendBase {
+class Tie : public ControlElement, public TimeSpanningInterface, public AttCurvature, public AttLineRendBase {
 public:
     /**
      * @name Constructors, destructors, and other standard methods

diff --git a/include/vrv/trill.h b/include/vrv/trill.h
@@ -25,7 +25,6 @@ namespace vrv {
  */
 class Trill : public ControlElement,
               public TimeSpanningInterface,
-              public AttColor,
               public AttExtender,
               public AttExtSymAuth,
               public AttExtSymNames,

diff --git a/include/vrv/turn.h b/include/vrv/turn.h
@@ -25,7 +25,6 @@ namespace vrv {
  */
 class Turn : public ControlElement,
              public TimePointInterface,
-             public AttColor,
              public AttExtSymAuth,
              public AttExtSymNames,
              public AttOrnamentAccid,

diff --git a/src/arpeg.cpp b/src/arpeg.cpp
@@ -29,14 +29,12 @@ namespace vrv {
 
 static const ClassRegistrar<Arpeg> s_factory("arpeg", ARPEG);
 
-Arpeg::Arpeg()
-    : ControlElement(ARPEG, "arpeg-"), PlistInterface(), TimePointInterface(), AttArpegLog(), AttArpegVis(), AttColor()
+Arpeg::Arpeg() : ControlElement(ARPEG, "arpeg-"), PlistInterface(), TimePointInterface(), AttArpegLog(), AttArpegVis()
 {
     this->RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
     this->RegisterAttClass(ATT_ARPEGLOG);
     this->RegisterAttClass(ATT_ARPEGVIS);
-    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_ENCLOSINGCHARS);
 
     this->Reset();
@@ -51,7 +49,6 @@ void Arpeg::Reset()
     TimePointInterface::Reset();
     this->ResetArpegLog();
     this->ResetArpegVis();
-    this->ResetColor();
     this->ResetEnclosingChars();
 
     m_drawingXRel = 0;

diff --git a/src/beamspan.cpp b/src/beamspan.cpp
@@ -36,13 +36,11 @@ BeamSpan::BeamSpan()
     , TimeSpanningInterface()
     , AttBeamedWith()
     , AttBeamRend()
-    , AttColor()
 {
     RegisterInterface(PlistInterface::GetAttClasses(), PlistInterface::IsInterface());
     RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     RegisterAttClass(ATT_BEAMEDWITH);
     RegisterAttClass(ATT_BEAMREND);
-    RegisterAttClass(ATT_COLOR);
 
     Reset();
     InitBeamSegments();
@@ -61,7 +59,6 @@ void BeamSpan::Reset()
     TimeSpanningInterface::Reset();
     ResetBeamedWith();
     ResetBeamRend();
-    ResetColor();
 
     ClearBeamSegments();
 }

diff --git a/src/bracketspan.cpp b/src/bracketspan.cpp
@@ -31,13 +31,11 @@ BracketSpan::BracketSpan()
     : ControlElement(BRACKETSPAN, "bspan-")
     , TimeSpanningInterface()
     , AttBracketSpanLog()
-    , AttColor()
     , AttLineRend()
     , AttLineRendBase()
 {
     this->RegisterInterface(TimeSpanningInterface::GetAttClasses(), TimeSpanningInterface::IsInterface());
     this->RegisterAttClass(ATT_BRACKETSPANLOG);
-    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_LINEREND);
     this->RegisterAttClass(ATT_LINERENDBASE);
 
@@ -51,7 +49,6 @@ void BracketSpan::Reset()
     ControlElement::Reset();
     TimeSpanningInterface::Reset();
     this->ResetBracketSpanLog();
-    this->ResetColor();
     this->ResetLineRend();
     this->ResetLineRendBase();
 }

diff --git a/src/breath.cpp b/src/breath.cpp
@@ -24,10 +24,9 @@ namespace vrv {
 
 static const ClassRegistrar<Breath> s_factory("breath", BREATH);
 
-Breath::Breath() : ControlElement(BREATH, "breath-"), TimePointInterface(), AttColor(), AttPlacementRelStaff()
+Breath::Breath() : ControlElement(BREATH, "breath-"), TimePointInterface(), AttPlacementRelStaff()
 {
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
 
     this->Reset();
@@ -39,7 +38,6 @@ void Breath::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    this->ResetColor();
     this->ResetPlacementRelStaff();
 }
 

diff --git a/src/caesura.cpp b/src/caesura.cpp
@@ -29,13 +29,11 @@ static const ClassRegistrar<Caesura> s_factory("caesura", CAESURA);
 Caesura::Caesura()
     : ControlElement(CAESURA, "caesura-")
     , TimePointInterface()
-    , AttColor()
     , AttExtSymAuth()
     , AttExtSymNames()
     , AttPlacementRelStaff()
 {
     this->RegisterInterface(TimePointInterface::GetAttClasses(), TimePointInterface::IsInterface());
-    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_EXTSYMAUTH);
     this->RegisterAttClass(ATT_EXTSYMNAMES);
     this->RegisterAttClass(ATT_PLACEMENTRELSTAFF);
@@ -49,7 +47,6 @@ void Caesura::Reset()
 {
     ControlElement::Reset();
     TimePointInterface::Reset();
-    this->ResetColor();
     this->ResetPlacementRelStaff();
 }
 

diff --git a/src/controlelement.cpp b/src/controlelement.cpp
@@ -28,10 +28,16 @@ namespace vrv {
 //----------------------------------------------------------------------------
 
 ControlElement::ControlElement()
-    : FloatingObject(CONTROL_ELEMENT, "ce"), AltSymInterface(), LinkingInterface(), AttLabelled(), AttTyped()
+    : FloatingObject(CONTROL_ELEMENT, "ce")
+    , AltSymInterface()
+    , LinkingInterface()
+    , AttColor()
+    , AttLabelled()
+    , AttTyped()
 {
     this->RegisterInterface(AltSymInterface::GetAttClasses(), AltSymInterface::IsInterface());
     this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_LABELLED);
     this->RegisterAttClass(ATT_TYPED);
 
@@ -43,6 +49,7 @@ ControlElement::ControlElement(ClassId classId)
 {
     this->RegisterInterface(AltSymInterface::GetAttClasses(), AltSymInterface::IsInterface());
     this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_LABELLED);
     this->RegisterAttClass(ATT_TYPED);
 
@@ -54,6 +61,7 @@ ControlElement::ControlElement(ClassId classId, const std::string &classIdStr)
 {
     this->RegisterInterface(AltSymInterface::GetAttClasses(), AltSymInterface::IsInterface());
     this->RegisterInterface(LinkingInterface::GetAttClasses(), LinkingInterface::IsInterface());
+    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_LABELLED);
     this->RegisterAttClass(ATT_TYPED);
 
@@ -67,6 +75,7 @@ void ControlElement::Reset()
     FloatingObject::Reset();
     AltSymInterface::Reset();
     LinkingInterface::Reset();
+    this->ResetColor();
     this->ResetLabelled();
     this->ResetTyped();
 }