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

Rebase and fix GTP import tests.

Browse source 
Note: GTP import seems to have some issues; tests have been 'fixed' to accommodate the new support for transposing TAB's, but the results are possibly wrong anyway, if the underlying import is not correct. I'll file appropriate issues in the issue tracker.
This commit is contained in:
Maurizio M. Gavioli 2015-02-18 11:31:03 +01:00
parent 23f3348405
commit 3f483c8ed3
3 changed files with 967 additions and 961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libmscore/stringdata.cpp
View file

@ -89,7 +89,7 @@ void StringData::write(Xml& xml) const
// convertPitch
// Finds string and fret for a note.
//
// Fills *string and *fret with suitable values for pitch
// Fills *string and *fret with suitable values for pitch at given tick of given staff,
// using the highest possible string.
// If note cannot be fretted, uses fret 0 on nearest string and returns false
//
@ -105,7 +105,10 @@ bool StringData::convertPitch(int pitch, Staff* staff, int tick, int* string, in
//---------------------------------------------------------
// getPitch
// Returns the pitch corresponding to the string / fret combination
// Returns the pitch corresponding to the string / fret combination
// at given tick of given staff.
// Returns INVALID_PITCH if not possible
// Note: frets above max fret are accepted.
//---------------------------------------------------------
int StringData::getPitch(int string, int fret, Staff* staff, int tick) const
@ -116,7 +119,8 @@ int StringData::getPitch(int string, int fret, Staff* staff, int tick) const
//---------------------------------------------------------
// fret
// Returns the fret corresponding to the pitch / string combination
// returns -1 if not possible
// at given tick of given staff.
// Returns FRET_NONE if not possible
//---------------------------------------------------------
int StringData::fret(int pitch, int string, Staff* staff, int tick) const
@ -265,7 +269,7 @@ int StringData::pitchOffsetAt(Staff* staff, int /*tick*/)
// convertPitch
// Finds string and fret for a note.
//
// Fills *string and *fret with suitable values for pitch
// Fills *string and *fret with suitable values for pitch / pitchOffset,
// using the highest possible string.
// If note cannot be fretted, uses fret 0 on nearest string and returns false
//
@ -311,7 +315,9 @@ bool StringData::convertPitch(int pitch, int pitchOffset, int* string, int* fret
//---------------------------------------------------------
// getPitch
// Returns the pitch corresponding to the string / fret combination
// Returns the pitch corresponding to the string / fret / pitchOffset combination.
// Returns INVALID_PITCH if not possible
// Note: frets above max fret are accepted.
//---------------------------------------------------------
int StringData::getPitch(int string, int fret, int pitchOffset) const
@ -325,8 +331,8 @@ int StringData::getPitch(int string, int fret, int pitchOffset) const
//---------------------------------------------------------
// fret
// Returns the fret corresponding to the pitch / string combination
// returns -1 if not possible
// Returns the fret corresponding to the pitch / string / pitchOffset combination.
// returns FRET_NONE if not possible
//---------------------------------------------------------
int StringData::fret(int pitch, int string, int pitchOffset) const

954
mtest/guitarpro/fret-diagram.gp4-ref.mscx
View file

File diff suppressed because it is too large Load diff

954
mtest/guitarpro/fret-diagram.gp5-ref.mscx
View file

File diff suppressed because it is too large Load diff