Skip to content

Feat #17430: Option for entering Swing Percentage as a real number rather than an integer #28434

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/engraving/dom/staff.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ SwingParameters Staff::swing(const Fraction& tick) const
int swingUnit = 0;
muse::ByteArray ba = style().styleSt(Sid::swingUnit).toAscii();
DurationType unit = TConv::fromXml(ba.constChar(), DurationType::V_INVALID);
int swingRatio = style().styleI(Sid::swingRatio);
float swingRatio = style().styleI(Sid::swingRatio);
if (unit == DurationType::V_EIGHTH) {
swingUnit = Constants::DIVISION / 2;
} else if (unit == DurationType::V_16TH) {
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/dom/stafftextbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class StaffTextBase : public TextBase
Segment* segment() const;
String channelName(voice_idx_t voice) const { return m_channelNames[voice]; }
void setChannelName(voice_idx_t v, const String& s) { m_channelNames[v] = s; }
void setSwingParameters(int unit, int ratio)
void setSwingParameters(int unit, float ratio)
{
m_swingParameters.swingUnit = unit;
m_swingParameters.swingRatio = ratio;
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/rw/write/twrite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2807,7 +2807,7 @@ void TWrite::writeProperties(const StaffTextBase* item, XmlWriter& xml, WriteCon
} else {
swingUnit = DurationType::V_ZERO;
}
int swingRatio = item->swingParameters().swingRatio;
float swingRatio = item->swingParameters().swingRatio;
xml.tag("swing", { { "unit", TConv::toXml(swingUnit) }, { "ratio", swingRatio } });
}

Expand Down
2 changes: 1 addition & 1 deletion src/engraving/style/styledef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
styleDef(barlineBeforeSigChange, false),
styleDef(doubleBarlineBeforeKeySig, false),
styleDef(doubleBarlineBeforeTimeSig, false),
styleDef(swingRatio, PropertyValue(60)),
styleDef(swingRatio, PropertyValue(60.0)),
styleDef(swingUnit, PropertyValue(String())),
styleDef(chordSymbolSpelling, NoteSpellingType::STANDARD),
styleDef(automaticCapitalization, true),
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/types/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ static inline Key operator-=(Key& a, const Key& b) { return a = Key(static_cast<

struct SwingParameters {
int swingUnit = 0;
int swingRatio = 0;
float swingRatio = 0;

bool isOn() const { return swingUnit != 0; }
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5177,8 +5177,8 @@ void ExportMusicXml::systemText(StaffTextBase const* const text, staff_idx_t sta
if (!text->swingParameters().swingUnit) {
m_xml.tag("straight");
} else {
const int swingPercentage = text->swingParameters().swingRatio;
const int swingDivisor = std::gcd(text->swingParameters().swingRatio, 100);
const int swingPercentage = static_cast<int>(text->swingParameters().swingRatio);
const int swingDivisor = std::gcd(static_cast<int>(text->swingParameters().swingRatio), 100);
m_xml.tag("first", 100 / swingDivisor);
m_xml.tag("second", swingPercentage / swingDivisor);
if (text->swingParameters().swingUnit == Constants::DIVISION / 2) {
Expand Down
Loading
Loading