Commit graph

45 commits

Author SHA1 Message Date
Igor Korsukov
a2bfb02954 fix #292631 fixed spanners (glissandos) layout 2020-03-26 16:41:36 +02:00
Dmitri Ovodok
b51896e5c0 fix #295881: fix a crash on undoing adding an instrument in continuous view 2019-10-22 12:56:06 +02:00
Dmitri Ovodok
f8718a8b42 Remove unused code
- Remove disabled and largely outdated continuous view layout code
 - Remove declarations of functions which have no definition
 - Remove unused global libmscore variables
 - Remove some excessive forward declarations
2019-08-03 15:52:09 +03:00
anatoly-os
5892cadcfb
Merge pull request #5076 from Jojo-Schmitz/continuous
fix #289765: Continuous view: Key change forces double barline
2019-08-01 14:21:17 +02:00
Dmitri Ovodok
fba11e21b4 Disable unused linear layout code 2019-06-20 14:58:15 +02:00
Dmitri Ovodok
ec37301c37 fix #289922: don't reset tempomap in continuous view
Tempo is handled on measure layout stage which is common for page
and continuous view. We don't reset the whole tempomap for page view
currently, and we don't really need to do so for continuous view too.
2019-06-20 14:58:15 +02:00
Dmitri Ovodok
37fdb4b11b fix #287000: fix incorrect tempo if part is set to a continuous view 2019-06-18 13:20:37 +02:00
Joachim Schmitz
4251aba47c fix #289765: Continuous view: Key change forces double barline 2019-05-27 19:49:22 +02:00
Marc Sabatella
ddbb5c1266 fix #286882: apply layout range to continuous view + collect_artifacts 2019-05-15 16:57:06 -06:00
Marc Sabatella
6b7f33ec64 fix #278999, fix #288474: autoplace customization 2019-05-01 07:52:11 -06:00
Marc Sabatella
96f74d992b fix #285603: cross-staff tremolo 2019-03-25 14:31:32 -06:00
Marc Sabatella
2d600594e2 fix #285802: cross-staff tuplets 2019-03-25 14:31:32 -06:00
ws
ec3be9a99a Replacd integer midi tick values by fractions.
- tick names a position on the time axis
- tick is always a Fraction()
- only Measure() and Segment() (and Tuplet?) have a tick value
- tick() for an generic element return only a sensible value if isMeasure() or isSegment() or isSegment(parent())

- "ticks" names a duration stored in a Fraction()
- the tick value for an Segment is relative to its measure

- rename "duration" to "ticks"
- rename afrac() to tick()
- rename rfrac() to rtick()
- rename some variables, changing "fraction" into "tick"
  (example: actualFraction() into actualTicks())

- Lyrics ticks are written as Fraction, on read if xmlreader sees a "/" it reads a fraction
  else midi ticks for backwards compatibility
2019-02-18 11:46:05 +01:00
Marc Sabatella
65ef5321fb fix #279925: double sigs on switch from page to continuous view 2019-02-08 10:27:30 -07:00
Dmitri Ovodok
62f5d132bf fix #280095, fix #278964: rework duration types hanling with tremolo 2018-12-19 15:42:47 +02:00
Dr. Hermann Vogt
e09d990c28 fix #279995: second (unneeded) layout of voltas in linear view removed. 2018-12-14 09:11:06 +01:00
Hermann Vogt
ee304544cf Complete reordering of the layout sequence.
This includes:
fix #279391 Staff text, chord symbols etc will fit under the volta.  If we have fret diagrams, the chord symbols will be above the fret diagrams and the volta.
fix #279885: Tempo Text will be above all other text.
2018-12-13 07:58:23 +01:00
anatoly-os
e5d17fc306
Merge pull request #4342 from pthvogt/278153-voltas
278153 voltas
2018-12-12 21:20:19 +02:00
Joachim Schmitz
88d37365a6 fix compiler warnings, seen in MinGW and MSVC 2018-12-12 14:03:43 +01:00
Hermann Vogt
e3d1051c25 fix #278153: Moved layout of voltas behind Tempo Text: Voltas set the right tempo now, as they now reference the correct tempo set by the tempo text.
Also corrected testVoltaTemp.
2018-12-11 12:57:18 +01:00
anatoly-os
ebdc80a563
Merge pull request #4332 from dmitrio95/layoutlinear-overhaul
fix #278865, fix #279521: reuse system elements layout code in linear mode
2018-12-10 17:22:19 +02:00
ws
d5298f5d68 fix #279464 Error opening file created in 2.3.2
Tuplets can be layouted only if beams on the tuplet chord/rests are layouted.
Cross beams complicate this a lot as a cross beam can only be layouted after staff
distances are fixed.
2018-12-09 11:05:17 +01:00
Dmitri Ovodok
7cf8fc208a fix #278865, fix #279521: reuse system elements layout code in linear mode 2018-12-06 16:29:45 +02:00
anatoly-os
722ddc2202
Merge pull request #4225 from dmitrio95/277721-lyricsline-layoutlinear
fix #277721: fix layout of lyrics lines in continuous view
2018-11-26 19:09:04 +02:00
Dmitri Ovodok
43c3b43f4c fix #276716: show instruments names in continuous view 2018-11-26 16:36:47 +02:00
Dmitri Ovodok
6c9785f60e fix #277721: fix layout of lyrics lines in continuous view 2018-11-26 16:07:25 +02:00
Dmitri Ovodok
0ba423d90a fix #277719: add a buffer space at the end of continuous view page 2018-11-17 13:14:03 +02:00
ws
1edd676aa7 fix #277699 Staff properties corrupted on MusicXML import after Master Palette opened
The problem is deep in the initialization of staff types in Staff.
This commit also tries to make handling of StaffType more "const correct" and adds some
assertions which may lead to crashes (and helps detecting bad code).
2018-11-08 15:50:00 +01:00
ws
9c8ca0fdb4 fix #277666 Space for instrument name of hidden staff is reserved 2018-11-06 10:21:01 +01:00
ws
3fdfab33f4 fix #277717 Adding hairpins in continuous view leads to crash 2018-11-05 18:51:35 +01:00
ws
d77183b3bb refactoring of Element::userOff and TextBase::offset 2018-10-18 11:56:23 +02:00
Joachim Schmitz
fe50c85097 fix #275218: fix MSVC C4458 warnings
reg. a declaration shadowing a class member,
"Warning C4458: declaration of 'XXX' hides class member"
2018-09-27 17:38:20 +02:00
alexandr
eceb5d71a0 fix #276144: Scroll in cont. view limited to less than all instruments
Extend rectangle of page box to cover all score's area in continious view mode.
2018-09-21 11:40:37 +02:00
alexandr
34cf407404 fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score
Add reading timeStretch for feramta from mscz
Add calculating ticks for segments before first using fermata
Add fermata.mscx to unit tests
2018-09-14 09:09:29 +02:00
Joachim Schmitz
b27817fe19 fix more MSVC warnings
* The one C4100
* The one C4189
* The two C4457
* The two C4701
* The 475 C4267, changing to size_t were easily possible, casting to
int elsewhere
* Fix GCC warnings reg. wrong printf format for a size_t, reg. unused
variables and reg. ambigous else branch, seen on Travis CI
2018-09-11 16:56:50 +02:00
ws
b232149321 remove measure staff shapes, replace with skyline 2018-09-11 16:30:47 +02:00
alexandr
4459158d4b fix #275592: Tempotext is not applied during playback 2.X->3.0
Add if statement before applying new tempo. Because tempo should be setted by the MasterScore.
2018-09-05 15:14:41 +02:00
alexandr
59b44dc7fc fix #275589: Chord symbols fly away in Continuous view
Autoplacement add new shape of element to _staves but in continuous view old _staves is not reseted. So this container consist of ghost shapes after every update
2018-08-31 13:10:45 +02:00
Matt McClinch
0e4b2e0059 fix #275730: Crash when switching in Page View if mm rests are shown 2018-08-29 12:38:48 -04:00
alexandr
b259099300 fix #275552 fix#137501: Inability to show MM rests in Continuous View
1) The reason of crash is utilizing already deleted pointer. Each element are lying in tree.   The parent of VBox element is System element. When we change mode to continuous view MS deleted all system elements and create new one. Then populate new tree with new system which root. But VBox is not shown in continuous view and MS do not set new parent for VBox. Sow VBox have pointer to deleted SYstem element. I fixed it.
2) Add header file to libmscore/CMakeLists. It doesn't effect on building, But it is necessary to include header files to Visual Studio IDE

3) Fix inability to show multi-measure rests in Continuous View see https://musescore.org/en/node/137501
2018-08-29 12:04:48 +02:00
ws
a79f692ad7 fix #267726 Crash in Continous view when append a text frame in a file > 1 page 2018-08-29 12:01:44 +02:00
ws
5fbc381a6f fix #275691 The last measure of score can't be selected in Continous View 2018-08-29 10:54:06 +02:00
Matt McClinch
0b246c48f4 fix #122226: Crashes related to having no measures in the score 2018-08-22 11:06:08 -04:00
ws
fb4d3c38c6 line layout mode: remove vertical collision detection to speed up layout 2018-08-17 15:55:17 +02:00
ws
411b463f7a refactoring of layout for linear layout mode 2018-08-16 16:43:07 +02:00