Skip to content

Commit

Permalink
fix mtest
Browse files Browse the repository at this point in the history
  • Loading branch information
@lasconic
lasconic committed Aug 23, 2017
1 parent 42b1583 commit 4d37244
Show file tree
Hide file tree
Showing 4 changed files with 262 additions and 145 deletions.
2 changes: 1 addition & 1 deletion mscore/importgtp-gp6.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,7 @@ void GuitarPro6::readMasterBars(GPPartInfo* partInfo)

void GuitarPro6::readGpif(QByteArray* data)
{
qDebug() << QString(*data);
//qDebug() << QString(*data);
QDomDocument qdomDoc;
qdomDoc.setContent(*data);
QDomElement qdomElem = qdomDoc.documentElement();
Expand Down
135 changes: 87 additions & 48 deletions mtest/guitarpro/let-ring.gp4-ref.mscx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,54 +102,67 @@
<velocity>80</velocity>
<lid>5</lid>
</Dynamic>
<Pedal id="2">
<beginHookHeight>-1.2</beginHookHeight>
<endHook>1</endHook>
<endHookHeight>1</endHookHeight>
<lid>15</lid>
<pos x="0" y="-10.5"/>
<Segment>
<subtype>0</subtype>
<off2 x="0" y="0"/>
<pos x="7.5175" y="-2.5"/>
</Segment>
<beginText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</beginText>
<continueText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</continueText>
</Pedal>
<Chord>
<lid>6</lid>
<durationType>quarter</durationType>
<Note>
<lid>7</lid>
<Text>
<lid>8</lid>
<style></style>
<halign>center</halign>
<valign>center</valign>
<xoffset>0</xoffset>
<yoffset>-2</yoffset>
<italic>1</italic>
<text>let ring</text>
</Text>
<pitch>60</pitch>
<tpc>14</tpc>
<fret>5</fret>
<string>2</string>
</Note>
</Chord>
<endSpanner id="2"/>
<Chord>
<lid>9</lid>
<lid>8</lid>
<durationType>quarter</durationType>
<Note>
<lid>10</lid>
<lid>9</lid>
<pitch>57</pitch>
<tpc>17</tpc>
<fret>2</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>11</lid>
<lid>10</lid>
<durationType>quarter</durationType>
<Note>
<lid>12</lid>
<lid>11</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>4</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>13</lid>
<lid>12</lid>
<durationType>quarter</durationType>
<Note>
<lid>14</lid>
<lid>13</lid>
<pitch>62</pitch>
<tpc>16</tpc>
<fret>7</fret>
Expand Down Expand Up @@ -285,54 +298,67 @@
<velocity>80</velocity>
<lid>5</lid>
</Dynamic>
<Pedal id="3">
<beginHookHeight>-1.2</beginHookHeight>
<endHook>1</endHook>
<endHookHeight>1</endHookHeight>
<lid>15</lid>
<pos x="0" y="-10.5"/>
<Segment>
<subtype>0</subtype>
<off2 x="0" y="0"/>
<pos x="8.3275" y="-2.5"/>
</Segment>
<beginText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</beginText>
<continueText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</continueText>
</Pedal>
<Chord>
<lid>6</lid>
<durationType>quarter</durationType>
<Note>
<lid>7</lid>
<Text>
<lid>8</lid>
<style></style>
<halign>center</halign>
<valign>center</valign>
<xoffset>0</xoffset>
<yoffset>-2</yoffset>
<italic>1</italic>
<text>let ring</text>
</Text>
<pitch>60</pitch>
<tpc>14</tpc>
<fret>5</fret>
<string>2</string>
</Note>
</Chord>
<endSpanner id="3"/>
<Chord>
<lid>9</lid>
<lid>8</lid>
<durationType>quarter</durationType>
<Note>
<lid>10</lid>
<lid>9</lid>
<pitch>57</pitch>
<tpc>17</tpc>
<fret>2</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>11</lid>
<lid>10</lid>
<durationType>quarter</durationType>
<Note>
<lid>12</lid>
<lid>11</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>4</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>13</lid>
<lid>12</lid>
<durationType>quarter</durationType>
<Note>
<lid>14</lid>
<lid>13</lid>
<pitch>62</pitch>
<tpc>16</tpc>
<fret>7</fret>
Expand All @@ -351,54 +377,67 @@
<lid>2</lid>
<accidental>0</accidental>
</KeySig>
<Pedal id="4">
<beginHookHeight>-1.2</beginHookHeight>
<endHook>1</endHook>
<endHookHeight>1</endHookHeight>
<lid>15</lid>
<pos x="0" y="-10.5"/>
<Segment>
<subtype>0</subtype>
<off2 x="0" y="0"/>
<pos x="8.3275" y="-2.5"/>
</Segment>
<beginText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</beginText>
<continueText>
<style>Pedal</style>
<italic>1</italic>
<text>let ring</text>
</continueText>
</Pedal>
<Chord>
<lid>6</lid>
<durationType>quarter</durationType>
<Note>
<lid>7</lid>
<Text>
<lid>8</lid>
<style></style>
<halign>center</halign>
<valign>center</valign>
<xoffset>0</xoffset>
<yoffset>-2</yoffset>
<italic>1</italic>
<text>let ring</text>
</Text>
<pitch>60</pitch>
<tpc>14</tpc>
<fret>5</fret>
<string>2</string>
</Note>
</Chord>
<endSpanner id="4"/>
<Chord>
<lid>9</lid>
<lid>8</lid>
<durationType>quarter</durationType>
<Note>
<lid>10</lid>
<lid>9</lid>
<pitch>57</pitch>
<tpc>17</tpc>
<fret>2</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>11</lid>
<lid>10</lid>
<durationType>quarter</durationType>
<Note>
<lid>12</lid>
<lid>11</lid>
<pitch>59</pitch>
<tpc>19</tpc>
<fret>4</fret>
<string>2</string>
</Note>
</Chord>
<Chord>
<lid>13</lid>
<lid>12</lid>
<durationType>quarter</durationType>
<Note>
<lid>14</lid>
<lid>13</lid>
<pitch>62</pitch>
<tpc>16</tpc>
<fret>7</fret>
Expand Down
Loading

0 comments on commit 4d37244

Please sign in to comment.