Commit graph

4997 commits

Author SHA1 Message Date
Joachim Schmitz
5a9b6395de avoid warnings reg. unused variables 2014-06-17 14:35:16 +02:00
Joachim Schmitz
836db56543 fix warnings reg. wrong format specifier 2014-06-17 14:23:15 +02:00
Joachim Schmitz
82742300cd avoid warning reg. redefined macro 2014-06-17 14:23:12 +02:00
lasconic
33da9c14bd fix release build 2014-06-17 14:06:02 +02:00
Nicolas Froment
862ddaf062 Merge pull request #944 from Jojo-Schmitz/warnings
Fix warnings when building in RELEASE mode
2014-06-17 12:44:58 +02:00
Werner Schweer
17a2ce05a3 Merge pull request #974 from MarcSabatella/22205-microtonal
fix #22205: microtonal accidentals that change pitch display as naturals
2014-06-16 09:24:30 +02:00
Werner Schweer
ed04805636 Merge pull request #958 from Igevorse/jack_midi_in
Signals/slots fix
2014-06-16 09:20:13 +02:00
Werner Schweer
ef0b46847d Merge pull request #972 from mgavioli/Add_string_data_to_1.x_scores
Add string data to 1.x scores.
2014-06-16 09:17:12 +02:00
Werner Schweer
d7f05c53d0 Merge pull request #967 from mgavioli/Fix_25983_Crash_copying_accid_to_TAB
Fix #25983 - Crash when copy-paste to TAB includes accidentals
2014-06-16 09:16:35 +02:00
Werner Schweer
1e99e9f74e Merge pull request #953 from mgavioli/5-str_electr_bass_and_5-line_tab_presets
Add built-in def. for 5-string electr. bass and 5-line tab presets
2014-06-16 09:15:16 +02:00
Werner Schweer
8839205b60 Merge pull request #949 from mgavioli/Fix_25811_25867_Incomplete_layout_on_adding_linked_staff
Fix #25811 #25867 - Incomplete layout when adding linked staff
2014-06-16 09:14:29 +02:00
Nicolas Froment
9ae6863a22 Merge pull request #973 from lvinken/26001-crash-if-no-time-element
fix #26001 - [MusicXML import] crash if no time element
2014-06-13 17:37:11 +02:00
Marc Sabatella
264eee216a fix #22205: microtonal accidentals display as naturals after earlier accidental 2014-06-12 20:13:41 -06:00
Leon Vinken
12c6daa710 fix #26001 - [MusicXML import] crash if no time element 2014-06-12 22:07:52 +02:00
Maurizio M. Gavioli
0e677f20ae Check for null drumset before adding string data. 2014-06-12 16:33:22 +02:00
Maurizio M. Gavioli
1ae0a84331 Add string data to 1.x scores.
Based on the MIDI program of the instrument, the code tries to add string data to instruments read from 1.x scores.

It is not fool-proof and covers only the most common (and less likely to have been customized) cases). For other cases, the user will have to change the part instrument or to copy the part to a suitably created instrument.

It covers:
- guitar(s)
- bass(es), either bass guitars and double bass
- violin, viola and cello, as their MIDI programs are used for a number of other string instruments; in these cases, string number and7or tuning may need to be customized, but this at least provides a departure point.

Comments are welcome.
2014-06-12 01:28:24 +02:00
Maurizio M. Gavioli
ca5ec50d3e Merge pull request #969 from mgavioli/Fix_FigBass_multidigit_entries
Fix Figured Bass multi-digit entries
2014-06-11 18:41:47 +02:00
Maurizio M. Gavioli
e862c74af2 Merge pull request #968 from mgavioli/Fix_26021_Issues_with_non-conformant_FB_entries
Fix #26021 - Issues with non-conformant Figured Bass entries
2014-06-11 12:42:39 +02:00
Maurizio M. Gavioli
ae98e2c383 Fix Figured Bass multi-digit entries
Figured Bass entries with multi-digit numbers were not parsed.

Now, the F.B. parser accepts multi-digit numbers too.
2014-06-11 11:34:36 +02:00
Maurizio M. Gavioli
aeed353dbe Fix #26021 - Issues with non-conformant Figured Bass entries
Figured Bass which do not conform to F.B. 'rules' have several issues. See http://musescore.org/en/node/26021 for details.
2014-06-11 10:46:35 +02:00
Maurizio M. Gavioli
0b7a7ac367 Fix #25983 - Crash when copy-paste to TAB includes accidentals
The bug has been unveiled by this commit:
cbb388264a
but it probably preexisted.

It is caused in function `Score::pasteStaff()` where the election status after the paste is updated before the re-layout and re-format process is completed (with a call to `updateNotes()`).

Among other things, laying out a TAB involves removing accidentals (which have no room in a TAB) and this leaves the selection with inconsistent contents.

Fixed by moving the selection update step at the end of the `Score::pasteStaff()` function, after the call to `updateNotes()`.
2014-06-11 09:35:47 +02:00
ws
243d64fae2 fix #26096 2014-06-10 11:58:18 +02:00
ws
a3d7c1952f fix #26041 2014-06-10 10:58:44 +02:00
ws
f167972c81 fix #26106 2014-06-10 10:47:24 +02:00
Joachim Schmitz
9a636ac9c6 remove some unneeded '\n'
and also fix a typo
2014-06-10 09:27:55 +02:00
Joachim Schmitz
1a744fc836 fix overloading 2014-06-10 09:27:53 +02:00
Joachim Schmitz
843356beb7 disable unused local variables 2014-06-10 09:27:51 +02:00
Joachim Schmitz
cc7686e213 avoid unused variable (and code) in RELEASE mode 2014-06-10 09:27:50 +02:00
Joachim Schmitz
48f3ea412a initialize variables 2014-06-10 09:27:48 +02:00
Joachim Schmitz
c2d6a06daf disable unused local variables 2014-06-10 09:27:46 +02:00
Joachim Schmitz
ebf7981933 disable unused private members 2014-06-10 09:27:45 +02:00
Joachim Schmitz
5b60db7c4c disable bindings completly
not just the content
2014-06-10 09:27:43 +02:00
Joachim Schmitz
ea3f26ae90 add int to string the Qt way 2014-06-10 09:27:41 +02:00
Joachim Schmitz
dba4644b70 use correct format specifiers
%d rather than %ld for int resp. %hhd vs. %d for char
2014-06-10 09:27:39 +02:00
Joachim Schmitz
e474ac8363 don't compare pointers against NULL in C++11
either avoid it like done here or use nullptr
2014-06-10 09:27:37 +02:00
Joachim Schmitz
a96852a4bd ParDescr is a struct, not a class 2014-06-10 09:27:35 +02:00
Nicolas Froment
ea51a179cc Merge pull request #945 from BartlomiejLewandowski/selection-refactor-range
Selection refactor range
2014-06-09 16:12:55 +02:00
Nicolas Froment
f0a2509d59 Merge pull request #957 from seanyeh/fix-soprano-keysig
Fix the placements of flats in soprano clef
2014-06-09 16:07:02 +02:00
Nicolas Froment
e92c336206 Merge pull request #965 from jpirie/21928-gp-layout
Fix #21928 - Missing ledger lines / short stems etc
2014-06-09 11:05:51 +02:00
John Pirie
345de6a218 Fix #21928 - test showing issues with missing ledger lines / short stems is now correct 2014-06-09 08:50:04 +01:00
Nicolas Froment
4da1e0318a Merge pull request #963 from BartlomiejLewandowski/lyrics-highlight
fix #25981 Added lyrics to range selection.
2014-06-09 08:08:24 +02:00
Nicolas Froment
9ddfe8fe30 Merge pull request #964 from MarcSabatella/on_staff
correct staff-relative layout for instrument change, fret diagrams, and chord symbols
2014-06-09 08:06:07 +02:00
Marc Sabatella
4f42fb0d82 fix #24735: correct layout of fret diagrams & chord symbols 2014-06-07 20:23:50 -06:00
Marc Sabatella
ec2ea81374 fix #25445: instrument change elements are staff-relative 2014-06-07 17:47:01 -06:00
Nicolas Froment
f031e873b2 Merge pull request #959 from jpirie/gp-tuplet-bugs
Gp tuplet bugs
2014-06-07 10:22:50 +02:00
Nicolas Froment
81d86f6108 Merge pull request #960 from mgavioli/Fix_25958_EditStaff_crash_on_some_props_change
Fix #25958 - Crash when [Apply]ing and [OK]ing some prop changes
2014-06-07 10:22:23 +02:00
Bartlomiej Lewandowski
5f65e03916 fix #25981 Added lyrics to range selection. 2014-06-06 22:14:33 +02:00
ws
3bfb8d783e fix #25810 2014-06-06 16:37:04 +02:00
Maurizio M. Gavioli
d33388d2ed Fix #25811 #25867 - Incomplete layout when adding linked staff
If a linked staff of a different type/group is added to the score, the new staff is not completely laid out.

Fixes:

- Default clef of new staff is copied from default clef of original staff, rather than from its actual clef.
- When score instruments are updated, notes are updated before laying out chords, as chords need to have notes in correct position to compute correct stems, ledger lines, etc.
- Notes are updated via Score::cmdUpdateNotes() rather Score::updateNotes(), as the latter does not deals with the specifics of staff groups.
- cloneStaff() only clones clefs which do not alread exist AND are compatible with the staff group.
- cloneStaff() also updates the staff clef map when cloning a clef.
2014-06-06 13:09:02 +02:00
ws
f87cb01aa4 updates for page header/footer 2014-06-06 13:05:02 +02:00