Add support for meterSig@color

paul-bayleaf · Feb 7, 2024 · 0a82570 · 0a82570
1 parent 7607b26
commit 0a82570
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/include/vrv/metersig.h b/include/vrv/metersig.h
@@ -25,6 +25,7 @@ class ScoreDefInterface;
  * This class models the MEI <meterSig> element.
  */
 class MeterSig : public LayerElement,
+                 public AttColor,
                  public AttEnclosingChars,
                  public AttExtSymNames,
                  public AttMeterSigLog,

diff --git a/src/iomei.cpp b/src/iomei.cpp
@@ -2629,6 +2629,7 @@ void MEIOutput::WriteMeterSig(pugi::xml_node currentNode, MeterSig *meterSig)
     }
 
     this->WriteLayerElement(currentNode, meterSig);
+    meterSig->WriteColor(currentNode);
     meterSig->WriteEnclosingChars(currentNode);
     meterSig->WriteMeterSigLog(currentNode);
     meterSig->WriteMeterSigVis(currentNode);
@@ -6689,6 +6690,7 @@ bool MEIInput::ReadMeterSig(Object *parent, pugi::xml_node meterSig)
         this->UpgradeMeterSigTo_5_0(meterSig, vrvMeterSig);
     }
 
+    vrvMeterSig->ReadColor(meterSig);
     vrvMeterSig->ReadEnclosingChars(meterSig);
     vrvMeterSig->ReadExtSymNames(meterSig);
     vrvMeterSig->ReadMeterSigLog(meterSig);

diff --git a/src/metersig.cpp b/src/metersig.cpp
@@ -31,13 +31,15 @@ static const ClassRegistrar<MeterSig> s_factory("meterSig", METERSIG);
 
 MeterSig::MeterSig()
     : LayerElement(METERSIG, "msig-")
+    , AttColor()
     , AttEnclosingChars()
     , AttExtSymNames()
     , AttMeterSigLog()
     , AttMeterSigVis()
     , AttTypography()
     , AttVisibility()
 {
+    this->RegisterAttClass(ATT_COLOR);
     this->RegisterAttClass(ATT_ENCLOSINGCHARS);
     this->RegisterAttClass(ATT_EXTSYMNAMES);
     this->RegisterAttClass(ATT_METERSIGLOG);
@@ -53,6 +55,7 @@ MeterSig::~MeterSig() {}
 void MeterSig::Reset()
 {
     LayerElement::Reset();
+    this->ResetColor();
     this->ResetEnclosingChars();
     this->ResetExtSymNames();
     this->ResetMeterSigLog();