Commit graph

84 commits

Author SHA1 Message Date
AntonioBL
78d9a2978c fix #285434 : Certain 2.x frame texts imported with no style 2020-04-13 22:57:19 +02:00
Igor Korsukov
68b3415c47 fixed some issues from PVS-Studio report (step1) 2020-03-20 12:18:07 +02:00
Joachim Schmitz
6373ac3dfe copy #include <QMultiMap> to all.h
but continue to use it directly in excerpt.h (but before the 'internal'
headers) and use it directly in xm.h and changeMap.h too, which so far
don't seem to include them directly nor indirectly
2020-02-15 12:51:50 +01: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
Dmitri Ovodok
907a4dcc31 fix #296426: fix not linking multiple elements at the same tick in MM rests on score loading
The issue has two parts:

1) If a linked element belongs not to the first MM rest measure (e.g.
a BarLine), <linked> and <linkedMain> tags may have been written out
of a proper order.
2) If several links bind pairs of elements in the same score at the
same tick, these linkes may have been not established properly on
score loading.

Both issues needs to be fixed to fix linking of elements in the case
described in the issue (MM rests split by a barline with text elements
attached), so both fixes are included to this commit.
2019-11-03 14:20:13 +02:00
ws
9efd301242 Add changes from mattmcclinch to fix regression tests for musicxml and gtp import and scripting. 2019-02-18 11:48:24 +01: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
anatoly-os
295ffe8ed1 fix crash when creating workspace with GUI Preferences
Make it possible to read/write qlonglong values in XmlWriter/XmlReader
2018-12-21 15:56:03 +02:00
anatoly-os
6d70cc9a9a
Merge pull request #4381 from dmitrio95/276235-2.X-system-staff-text-2
fix #276235: make it possible to enable readahead for XmlReader
2018-12-12 21:05:08 +02:00
Dmitri Ovodok
3a10013012 fix #276235: make it possible to enable readahead for XmlReader
Also actually use that possibility for correct importing of 2.X
system/staff text for both compressed and uncompressed files.
2018-12-12 18:29:53 +02:00
Dmitri Ovodok
26057b6c94 Remove unused code from XmlReader and XmlWriter
Most of that code became unused after the summer's fileformat
changes, some code got obsolete earlier.
2018-12-12 17:35:24 +02:00
anatoly-os
39501b5adf
Merge pull request #4278 from dmitrio95/fix-bad-memory-access
Fix some cases of bad memory access
2018-12-05 22:22:21 +02:00
ws
584e193e7d fix #278366 Slides: user positions set in 2.x are lost 2018-12-04 14:24:45 +01:00
Dmitri Ovodok
76a22bd831 Fix freed memory reading when removing connectors, use unique_ptr for connectors management
Reading of freed memory occurred in ConnectorInfoReader::operator=
(via a connector() call) when removing the connector info from
connector info list. The previous implementation would also work
incorrectly in case of replacing QList to any vector container.
2018-12-02 01:38:46 +02:00
Dmitri Ovodok
70d836713a Make it possible to write voice and position for handling them in score diff 2018-10-29 16:32:31 +02:00
Dmitri Ovodok
c95dfd5a40 Make it possible to record elements written to MSCX 2018-10-29 16:30:19 +02:00
Dmitri Ovodok
41366f5a5e Avoid using linked IDs (<lid>) when writing linked elements
This commit includes also the following changes needed for correct
work of the changed links reading code:
- Correct current reading position when reading multimeasure rests
- Assign track number for Fingering while reading MSCX
2018-08-16 19:10:29 +03:00
Dmitri Ovodok
2c28195c1c Add a framework to read/write connectors using relative positions instead of IDs
Try to reconnect broken connectors while reading MSCX files
2018-08-16 19:10:28 +03:00
Dmitri Ovodok
9bb7666779 Use a universal <location> tag to denote various position shifts 2018-08-16 19:09:58 +03:00
Dmitri Ovodok
b4da00bae2 Miscellaneous changes used for MSCX format rework
Those changes include:
- Add a possibility to write comments to MSCX files
- Add Element::findMeasureBase and constant version of Element::findMeasure
- Store index of the currently read measure in XmlReader. Correct behaviour of MeasureBase::index.
- Minor spanners-related additions to elements creation and conversion
2018-08-16 19:08:45 +03:00
Dmitri Ovodok
55bef706b8 Add API for retrieving positions of elements in terms of fractions
Rename fpos -> rfrac
Merge Element::ftick with Element::afrac
2018-08-16 19:08:45 +03:00
ws
10ebbb9080 update text style implementation 2018-08-01 11:46:35 +02:00
ws
ba8039e9bf fix #228366 Self-defined text styles lead to crash 2018-06-11 14:16:27 +02:00
ws
33d1cd7fb4 rename StyleIdx -> Sid and P_ID -> Pid 2018-03-27 15:36:00 +02:00
anatoly-os
8915b35db2 Fixed clang warnings:
- removed obsolete Score* _score from XmlReader
- removed not used variables
- added braces for initializer list
- fixed using similar var names in one scope
2018-02-21 19:41:36 +01:00
Nicolas Froment
037b3980a5 Merge pull request #2921 from Jojo-Schmitz/score-props
Fixes for infos shown in Score Properties
2017-03-10 19:11:27 +01:00
Werner Schweer
723015c2a3 fix import problem of 2.x files with parts 2017-02-16 11:18:01 +01:00
Joachim Schmitz
2bbf303530 fix #152206: Revision is not shown in Score Properties
for scores from 2.0 or later, actually for scores created after the move
from sourceforge to GitHub
2017-02-03 09:34:19 +01:00
Werner Schweer
c5f46bb208 rename Xml() -> XmlWriter() 2016-11-19 11:51:21 +01:00
Werner Schweer
bb7d535ce5 add score ptr to XmlReader and Xml 2016-11-19 10:31:14 +01:00
Werner Schweer
6ca3fc19e0 fix #124166 printing from MuseScore or exporting via a third-party pdf printer causes an unexpected result 2016-09-26 10:19:35 +02:00
Werner Schweer
8c18761d3b change accidental file format 2016-09-22 12:02:41 +02:00
Werner Schweer
1e6beedc16 use property type SYMID for property SYMBOL 2016-09-19 13:59:57 +02:00
Werner Schweer
dae86056a3 preparations for new compatibility implementation 2016-09-13 09:40:54 +02:00
werner
b85cad9d83 replace ticks in mscore file by fraction 2016-07-07 16:20:29 +02:00
ws
097ac65733 fix more regressions; comment out all failing mtest 2016-04-13 12:07:48 +02:00
ws
5bee246125 some regression fixes 2016-04-13 12:05:47 +02:00
ws
a96c0abf5b replace XmlStreamReader by QXmlStreamReader 2016-04-13 11:35:22 +02:00
ws
03c13fa33e fix reading of xml tag breakMultiMeasureRest and 'irregular' 2015-04-08 11:58:33 +02:00
ws
75bd3ba77e fix slurs from staff n to staff n-1 2015-03-03 15:45:53 +01:00
ws
f1ab7b355c fix #47101 second try 2015-02-10 15:05:33 +01:00
ws
641d143d7e add scale property to fret diagram 2015-01-15 14:50:50 +01:00
ws
ff55cdd073 use QHash for beam and tuplet list in XmlReader 2014-12-17 10:46:12 +01:00
ws
846d8b5c51 fix #34496 2014-11-27 11:33:10 +01:00
ws
5ed2bc8be8 fix #35466 2014-11-06 10:44:57 +01:00
Bartlomiej Lewandowski
6d00168649 Added voice filtering for copy paste 2014-08-12 14:20:31 +02:00
Bartlomiej Lewandowski
4cfc41c4fc Made xml aware of filter
Conflicts:
	libmscore/xml.h
2014-07-30 14:49:09 +02:00
ws
61ba89d8b9 fix #28501 2014-07-30 12:34:56 +02:00
ws
f97a8b22c6 cleaner clef/cleflist implementation 2014-07-25 17:13:42 +02:00
ws
28a31ccddd fix #27901 2014-07-21 14:28:37 +02:00