LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #19073: tremolo beam thickness consistent with notehead size

Browse source
This commit is contained in:
James Mizen 2023-08-22 14:31:55 +01:00
parent 01411a6581
commit 7937402efa
2 changed files with 303 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engraving/rendering/dev/tdraw.cpp
View file

@ -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()) {

302
vtest/scores/trem-beam-small.mscx Normal file
View file

@ -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>