Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix #19073: tremolo beam thickness consistent with notehead size #19129

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Fix #19073: tremolo beam thickness consistent with notehead size #19129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7937402
Fix #19073: tremolo beam thickness consistent with notehead size
miiizen Aug 22, 2023
ff95e4f
Fix 2 note tremolo beams on small staves
miiizen Aug 23, 2023
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
9 changes: 0 additions & 9 deletions src/engraving/libmscore/tremolo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,6 @@ double Tremolo::chordMag() const
return explicitParent() ? toChord(explicitParent())->intrinsicMag() : 1.0;
}

//---------------------------------------------------------
// mag
//---------------------------------------------------------

double Tremolo::mag() const
{
return parentItem() ? parentItem()->mag() : 1.0;
}

//---------------------------------------------------------
// minHeight
//---------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion src/engraving/libmscore/tremolo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class Tremolo final : public EngravingItem
PointF chordBeamAnchor(const ChordRest* chord, ChordBeamAnchorType anchorType) const;

double chordMag() const;
double mag() const override;
RectF drag(EditData&) override;

void layout2();
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/rendering/dev/tdraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2850,7 +2850,7 @@ void TDraw::draw(const Tremolo* item, Painter* painter)
if (item->beamSegments().size() > 1 && d > M_PI / 6.0) {
d = M_PI / 6.0;
}
double ww = (item->style().styleMM(Sid::beamWidth).val() / 2.0) / sin(M_PI_2 - atan(d));
double ww = (item->beamWidth() / 2.0) / sin(M_PI_2 - atan(d));
painter->setBrush(Brush(item->curColor()));
painter->setNoPen();
for (const BeamSegment* bs1 : item->beamSegments()) {
Expand Down
302 changes: 302 additions & 0 deletions vtest/scores/trem-beam-small.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,302 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="4.10">
<programVersion>4.2.0</programVersion>
<programRevision></programRevision>
<Score>
<Division>480</Division>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<open>1</open>
<metaTag name="arranger"></metaTag>
<metaTag name="composer">Composer / arranger</metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2023-08-22</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Microsoft Windows</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="subtitle">Subtitle</metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle">Untitled score</metaTag>
<Order id="orchestral">
<name>Orchestral</name>
<instrument id="piano">
<family id="keyboards">Keyboards</family>
</instrument>
<section id="woodwind" brackets="true" barLineSpan="true" thinBrackets="true">
<family>flutes</family>
<family>oboes</family>
<family>clarinets</family>
<family>saxophones</family>
<family>bassoons</family>
<unsorted group="woodwinds"/>
</section>
<section id="brass" brackets="true" barLineSpan="true" thinBrackets="true">
<family>horns</family>
<family>trumpets</family>
<family>cornets</family>
<family>flugelhorns</family>
<family>trombones</family>
<family>tubas</family>
</section>
<section id="timpani" brackets="true" barLineSpan="true" thinBrackets="true">
<family>timpani</family>
</section>
<section id="percussion" brackets="true" barLineSpan="true" thinBrackets="true">
<family>keyboard-percussion</family>
<family>drums</family>
<family>unpitched-metal-percussion</family>
<family>unpitched-wooden-percussion</family>
<family>other-percussion</family>
</section>
<family>keyboards</family>
<family>harps</family>
<family>organs</family>
<family>synths</family>
<soloists/>
<section id="voices" brackets="true" barLineSpan="false" thinBrackets="true">
<family>voices</family>
<family>voice-groups</family>
</section>
<section id="strings" brackets="true" barLineSpan="true" thinBrackets="true">
<family>orchestral-strings</family>
</section>
<unsorted/>
</Order>
<Part id="1">
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
<small>1</small>
</StaffType>
<barLineSpan>1</barLineSpan>
</Staff>
<Staff id="2">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
<defaultClef>F</defaultClef>
</Staff>
<trackName>Piano</trackName>
<Instrument id="piano">
<longName>Piano</longName>
<shortName>Pno.</shortName>
<trackName>Piano</trackName>
<minPitchP>21</minPitchP>
<maxPitchP>108</maxPitchP>
<minPitchA>21</minPitchA>
<maxPitchA>108</maxPitchA>
<instrumentId>keyboard.piano</instrumentId>
<clef staff="2">F</clef>
<Channel>
<program value="0"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<Measure>
<voice>
<KeySig>
<concertKey>0</concertKey>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>67</pitch>
<tpc>15</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>67</pitch>
<tpc>15</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
</voice>
</Measure>
<Measure>
<voice>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>81</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>81</pitch>
<tpc>17</tpc>
</Note>
</Chord>
</voice>
</Measure>
</Staff>
<Staff id="2">
<Measure>
<voice>
<Clef>
<concertClefType>G</concertClefType>
<transposingClefType>G</transposingClefType>
<isHeader>1</isHeader>
</Clef>
<KeySig>
<concertKey>0</concertKey>
</KeySig>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>67</pitch>
<tpc>15</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>67</pitch>
<tpc>15</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
</voice>
</Measure>
<Measure>
<voice>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>81</pitch>
<tpc>17</tpc>
</Note>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
<Tremolo>
<subtype>c32</subtype>
</Tremolo>
</Chord>
<Chord>
<small>1</small>
<durationType>half</durationType>
<duration>1/4</duration>
<Note>
<pitch>81</pitch>
<tpc>17</tpc>
</Note>
</Chord>
</voice>
</Measure>
</Staff>
</Score>
</museScore>
Loading