Merge pull request #28492 from cbjeukendrup/remove_globalsig

Remove globalSig

Author: mike-spa

src/engraving/api/v1/elements.h

@@ -296,7 +296,6 @@ class EngravingItem : public apiv1::ScoreElement
     API_PROPERTY(timeStretch,             TIME_STRETCH)
     API_PROPERTY(ornamentStyle,           ORNAMENT_STYLE)
     API_PROPERTY(timesig,                 TIMESIG)
-    API_PROPERTY(timesigGlobal,           TIMESIG_GLOBAL)
     API_PROPERTY(timesigStretch,          TIMESIG_STRETCH)
     API_PROPERTY(timesigType,             TIMESIG_TYPE)
     API_PROPERTY(spannerTick,             SPANNER_TICK)

src/engraving/dom/property.cpp

@@ -227,7 +227,6 @@ static constexpr PropertyMetaData propertyList[] = {
     { Pid::START_ON_UPPER_NOTE,     true,  "startOnUpperNote",      P_TYPE::BOOL,               PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "start on upper note") },
 
     { Pid::TIMESIG,                 false, "timesig",               P_TYPE::FRACTION,           PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "time signature") },
-    { Pid::TIMESIG_GLOBAL,          false, 0,                       P_TYPE::FRACTION,           PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "global time signature") },
     { Pid::TIMESIG_STRETCH,         false, 0,                       P_TYPE::FRACTION,           PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "time signature stretch") },
     { Pid::TIMESIG_TYPE,            true,  "subtype",               P_TYPE::INT,                PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "subtype") },
     { Pid::SPANNER_TICK,            true,  "tick",                  P_TYPE::FRACTION,           PropertyGroup::APPEARANCE,      DUMMY_QT_TR_NOOP("propertyName", "tick") },

src/engraving/dom/property.h

@@ -234,7 +234,6 @@ enum class Pid {
     START_ON_UPPER_NOTE,
 
     TIMESIG,
-    TIMESIG_GLOBAL,
     TIMESIG_STRETCH,
     TIMESIG_TYPE,
     SPANNER_TICK,

src/engraving/dom/timesig.cpp

@@ -209,8 +209,6 @@ PropertyValue TimeSig::getProperty(Pid propertyId) const
         return groups().nodes();
     case Pid::TIMESIG:
         return PropertyValue::fromValue(m_sig);
-    case Pid::TIMESIG_GLOBAL:
-        return PropertyValue::fromValue(globalSig());
     case Pid::TIMESIG_STRETCH:
         return PropertyValue::fromValue(stretch());
     case Pid::TIMESIG_TYPE:
@@ -250,9 +248,6 @@ bool TimeSig::setProperty(Pid propertyId, const PropertyValue& v)
     case Pid::TIMESIG:
         setSig(v.value<Fraction>());
         break;
-    case Pid::TIMESIG_GLOBAL:
-        setGlobalSig(v.value<Fraction>());
-        break;
     case Pid::TIMESIG_STRETCH:
         setStretch(v.value<Fraction>());
         break;
@@ -291,8 +286,6 @@ PropertyValue TimeSig::propertyDefault(Pid id) const
         return String();
     case Pid::TIMESIG:
         return PropertyValue::fromValue(Fraction(4, 4));
-    case Pid::TIMESIG_GLOBAL:
-        return PropertyValue::fromValue(Fraction(1, 1));
     case Pid::TIMESIG_TYPE:
         return int(TimeSigType::NORMAL);
     case Pid::PLACEMENT:

src/engraving/dom/timesig.h

@@ -109,9 +109,6 @@ class TimeSig final : public EngravingItem
     const Groups& groups() const { return m_groups; }
     void setGroups(const Groups& e) { m_groups = e; }
 
-    Fraction globalSig() const { return (m_sig * m_stretch).reduced(); }
-    void setGlobalSig(const Fraction& f) { m_stretch = (m_sig / f).reduced(); }
-
     bool isLocal() const { return m_stretch != Fraction(1, 1); }
 
     PointF staffOffset() const override;