Commit graph

785 commits

Author SHA1 Message Date
pereverzev_v
9f70fbee53 Fixed a lot of compilation warnings fro GCC 2020-06-02 19:22:29 +02:00
Igor Korsukov
b6dabf5e0b fixed ctor colon 2020-05-29 21:15:25 +02:00
Igor Korsukov
45b9887603 changed code style 2020-05-28 09:50:45 +02:00
anatoly-os
08a16c86af Merge pull request #6073 from IsaacWeiss/305265-bracket-span
Fix #305265: Bracket added from palette only spans one staff regardless of selection
2020-05-20 14:14:03 +02:00
anatoly-os
86ddf86e00
Merge pull request #5614 from AntonioBL/courtesyclef
Fix Courtesy Clef visibility for most (simple) cases
2020-04-29 15:30:47 +03:00
anatoly-os
a10ec7027a
Merge pull request #5817 from Marr11317/mn-red
Measure numbers
2020-04-28 15:05:09 +03:00
AntonioBL
1e141fdfcc fix #151121 fix #286497 fix #298638 : fix courtesy clef visbility and add tests 2020-04-22 17:43:56 +02:00
anatoly-os
e9864d1e83
Merge pull request #5371 from mattmcclinch/294085-has-voices
fix #294085: all elements set to normal position if all rests in voices other than voice 1 are deleted
2020-04-20 15:51:47 +03:00
Marr11317
808911942c Fix #203026, fix #301847, Add Measure number inspector,
providing the ability to place measure numbers above and below the staff,
but also left, centered, and right.
2020-04-18 12:29:54 -04:00
Marr11317
3d474bd273 Rename staffs to staves 2020-04-18 12:04:41 -04:00
Marr11317
8ea3e54ea0 Make measure numbers deletable 2020-04-18 12:04:40 -04:00
Marr11317
316360b3a4 Add Measure Number element to palettes 2020-04-18 12:04:39 -04:00
Dmitri Ovodok
98e483bd0b Add spacingFactor parameter to position searching functions
This allows to define a ratio which is used to split canvas between
the adjacent segments, systems etc.
2020-04-17 00:05:37 +03:00
Dmitri Ovodok
265b5f9b2b Extract searchSegment function to search a segment by its x coordinate 2020-04-17 00:05:32 +03:00
anatoly-os
a5c92e2040
Merge pull request #5643 from dmitrio95/mscx-read-crash
Fix a crash on MSCZ reading, add a way of handling such errors
2020-04-16 13:34:06 +03:00
Matt McClinch
472cb6bfb5 fix #294085: all elements set to normal position if all rests in voices other than voice 1 are deleted
This factors out the inner workings of Measure::checkMultiVoices() into a variant of Measure::hasVoices() that takes a start tick and a length in addition to a staff index.

Co-authored-by: Howard-C <howardc@pku.edu.cn>
2020-04-08 08:22:07 -04:00
Igor Korsukov
a2bfb02954 fix #292631 fixed spanners (glissandos) layout 2020-03-26 16:41:36 +02:00
Dmitri Ovodok
2ce0f5e2a9
Merge pull request #5445 from mattmcclinch/292606-layout-image
fix #292606: image attached to a measure doesn't show
2020-03-20 15:01:43 +02:00
Dmitri Ovodok
5f975282f2
Merge pull request #5838 from igorkorsukov/pvs_fixeds_step1
Fixed some issues from PVS-Studio report (step1)
2020-03-20 14:10:12 +02:00
Igor Korsukov
68b3415c47 fixed some issues from PVS-Studio report (step1) 2020-03-20 12:18:07 +02:00
Igor Korsukov
482bd502c4 fixed crash on Measure write 2020-03-19 11:51:00 +02:00
Joachim Schmitz
c9ec1ac5d4 fix some compiler warnings differently/cleaner
as requested/discussed in PR #4989, by using size_t or at least
unsigned instead of casting to int when using the size() method of stl
containers (vectors etc.) in for loops.
Doesn't work everywhere though, not without either adding more casts
elsewhere or with massive code changes or with different compiler(s')
warnings.
Tested with MinGW 64-bit, MinGW 32-bit and MSVC 64-bit.
2020-03-03 14:39:24 +01:00
Niek van den Berg
2aafb6fd30 fix #287998 and #102676
Resolves: https://musescore.org/en/node/287998
Resolves: https://musescore.org/en/node/102676

When a measure contains a line or page break **and** the next measure contains a key/time
signature or clef change, a courtesy element is drawn at the end of the measure.
However, if all measures **after** the line or page break are deleted, these courtesy
elements are not removed because Measure::addSystemTrailer(Measure*) is never called
in Score::collectSystem(LayoutContext&) since there is no next measure. As a result
these courtesy elements are not disabled by Measure::addSystemTrailer(Measure*).
The solution is to call Measure::addSystemTrailer(Measure*) even when nm equals 0 and
Measure::addSystemTrailer(Measure*) will disable all courtesy elements in case nm equals 0.
2020-02-01 14:44:53 +01:00
Dmitri Ovodok
eb4b31315e fix #282492: don't crash on reading MSCX files with invalid measure length 2020-01-25 15:43:13 +02:00
luz.paz
f31624d746 fix various typos
* Found via `codespell -q 3 -S ./share/locale,./thirdparty -L ba,cann,clas,dur,foto,iff,nd,ois,ot,pres,possibile,snaped,strack,tage,te,uint,thru,valu`  
* Some revisions made per feedback given during review.
* Follow-up typos for review  
* Add revisions per feedback
2019-12-19 06:13:30 -05:00
Marc Sabatella
eb6de76dbc fix #295892: barline not displayed before horizontal frame followed by start repeat
Resolves: https://musescore.org/en/node/295892

If a measure is followed by a horizontal frame and then a measure with a start repeat,
the end barline of the first measure is not displayed.
This is because we are optiizing that away thinking it won't be needed
because we will simply use the start repeat of the next measure.
This would be true if not for the frame.
So I simply added a check to make sure the next measure is the same as the next measurebase,
and clarified the comments.
2019-11-05 09:58:30 -07:00
Matt McClinch
dd98fad5b1 fix #292606: image attached to a measure doesn't show
Resolves: https://musescore.org/en/node/292606.

Images added to a measure now belong to the measure itself, rather than to one of the measure's segments. This not only allows the image to be visible, but it also solve problems related to the positioning of the image.
2019-11-01 08:21:35 -04:00
anatoly-os
a6210b61f4
Merge pull request #5403 from mattmcclinch/295898-delete-stafftypechange
fix #295898: Deleting a StaffTypeChange causes a crash in macOS
2019-10-29 11:15:50 +02:00
Dmitri Ovodok
99c7b0d746 Add more information to setLayout() 2019-10-25 16:18:41 +02:00
Matt McClinch
c4f477603a fix #295898: Deleting a StaffTypeChange causes a crash in macOS 2019-10-20 12:30:42 -04:00
anatoly-os
ec4b29d84d fix MSVC warnings
C4456
2019-10-14 18:27:06 +02:00
anatoly-os
4d4f6f5663
Merge pull request #5327 from MarcSabatella/294126-navigate-measure-elements
fix #294126: cannot navigate to measure elements
2019-10-02 15:29:18 +02:00
Joachim Schmitz
596297507c fix MSVC/MinGW compiler warnings
and also fix a compiler warning fixed earlier in a different
(and better) way, see #4963
2019-10-02 07:45:32 +02:00
anatoly-os
ebfd3ea346
Merge pull request #5330 from Howard-C/local-timesig
fix #294580: generate courtesy signature if next system has a local time signature on any staff
2019-10-01 10:29:15 +02:00
Howard-C
4bd390e7a1 fix #294580: generate courtesy signature if next system has a local time signature on any staff
Resolves: https://musescore.org/node/294580.

Right now a courtesy time signature only generates if the local time signature is on the first staff, because the code only checks for the first track. The fix checks for all tracks.
2019-09-20 10:50:58 +08:00
Marc Sabatella
2f2aa3c731 fix #294485: don't wrap to begin/end on next/previous element
Blind users find it disorienting for the previous element command to wrap to the end,
or for next element to wrap back to the beginning.
Besides, no other navigation commands work that way.
This commit stops that behavior by simply swapping the calls
to Score::lastElement() and Score::firstElement() in the places where this wrapping occurs.
That is, if previous-element finds no previous element,
we return the first element.
2019-09-17 13:39:52 -06:00
Marc Sabatella
94d989429e fix #294126: cannot navigate to measure elements
The navigation code for next-element and previous-elements ignores measure elements
(elements in the el() list for the measure).
This change adds handling for this
by checking for measure elements before moving to the next or previous measure
in Segment::nextElement() and Segment::previousElement(),
There is corresponding code in Measure::nextElementStaff()
and in Measure::previousElementStaff()
to iterate through multiple elements if present.
2019-09-17 12:55:46 -06:00
Marc Sabatella
ceaea1f149 fix #292510, fix #292928: navigation and screenreader support for frames
Added code to read the text within frames in accessibleExtraInfo(),
but also fixed the navigation to check for a frame
before moving to the next/previous measure.
Because frames will generally have a track of -1,
I also needed to take advantage of the tracking of the current track from a previous commit
so that nagivation continues on the correct track after passing through a frame.
I also needed to be careful to handle the -1.
2019-09-17 13:33:23 +02:00
Matt McClinch
5925ea19ad fix #294156: Incorrect segment type for fermata 2019-09-06 14:51:27 -04:00
anatoly-os
8b94d49e82
Merge pull request #5090 from MarcSabatella/290061-header-to-clef
fix #290061: no space between header and clef change
2019-08-30 20:37:56 +02:00
Howard-C
73ad2b4e13 fix #293877: adding or dragging spacers causes a full re-layout
Comes from https://musescore.org/en/node/290398#comment-940605. This can cause a serious delay on big scores.

The idea of fixing is changing the score()->setLayoutAll() to triggerLayout() in the functions of dropping and editing spacers. triggerLayout() will only do neccessary partial layout.
2019-08-29 11:41:20 +08:00
anatoly-os
6546b0ee1f
Merge pull request #5271 from Jojo-Schmitz/staff-type-change
Fix #293464: Slash style for staff type change: Inspector label and function are not the same
2019-08-28 12:21:27 +02:00
Joachim Schmitz
32cbcfe034 Fix #293460: Crash when loading file with orphan Segment tags
correct broken files on the fly and don't create them anymore.
2019-08-21 15:58:09 +02:00
Joachim Schmitz
a53bac4711 replace slashStyle with stemless
and all related things along with it, including a compatibility layer
2019-08-19 15:07:30 +02:00
Dmitri Ovodok
754ddfd307 fix #291698: ensure consistent state of two-notes tremolo after file reading 2019-07-06 15:35:18 +03:00
Dmitri Ovodok
9d7f4e460e
Merge pull request #5146 from mattmcclinch/291051-keysig-redo
fix #291051: Crash on redo after deleting a key signature
2019-06-27 11:18:15 +02:00
Dmitri Ovodok
455b086a1c Fix reading sticking elements from a file 2019-06-26 09:23:28 +02:00
Matt McClinch
1c8c51aa24 fix #291051: Crash on redo after deleting a key signature 2019-06-20 14:43:26 -04:00
Matt McClinch
29750063ff fix #287432: Key signature appears in multimeasure rest after being deleted from underlying measure 2019-06-17 11:02:45 -04:00
Dmitri Ovodok
2776f55b0e
Merge pull request #5127 from mattmcclinch/284481-deleted-rests
fix #284481: Automatic placement of single rests in multiple voice areas
2019-06-15 11:22:21 +02:00