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

extend inspector for Hairpin

Browse source
This commit is contained in:
Werner Schweer 2012-09-19 14:12:24 +02:00
parent efb6d19027
commit aff8b7c7ac
5 changed files with 80 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/hairpin.h
View file

@ -43,6 +43,8 @@ class HairpinSegment : public LineSegment {
//---------------------------------------------------------
// @@ Hairpin
// @P subtype enum HairpinType CRESCENDO, DECRESCENDO
// @P veloChange int
// @P dynType enum Element::DynamicType
//---------------------------------------------------------
class Hairpin : public SLine {

4
mscore/importove.cpp
View file

@ -1413,7 +1413,7 @@ void OveToMScore::convertNotes(Measure* measure, int part, int staff, int track)
cr = measure->findChord(tick, noteTrack, graceLevel);
if (cr == 0) {
Segment::SegmentType st = Segment::SegChordRest;
// Segment::SegmentType st = Segment::SegChordRest;
cr = new Chord(score_);
cr->setTrack(noteTrack);
@ -1437,7 +1437,7 @@ void OveToMScore::convertNotes(Measure* measure, int part, int staff, int track)
cr->setDurationType(TDuration::V_EIGHT);
}
st = Segment::SegGrace;
// st = Segment::SegGrace;
} else {
TDuration duration = OveNoteType_To_Duration(container->getNoteType());
duration.setDots(container->getDot());

4
mscore/importxml.cpp
View file

@ -5025,7 +5025,7 @@ void MusicXml::xmlNote(Measure* measure, int staff, const QString& partId, QDomE
int gl = nrOfGraceSegsReq(pn);
cr = measure->findChord(loc_tick, track, grace);
if (cr == 0) {
Segment::SegmentType st = Segment::SegChordRest;
// Segment::SegmentType st = Segment::SegChordRest;
cr = new Chord(score);
cr->setBeamMode(bm);
cr->setTrack(track);
@ -5051,7 +5051,7 @@ void MusicXml::xmlNote(Measure* measure, int staff, const QString& partId, QDomE
}
else
cr->setDurationType(TDuration::V_EIGHT);
st = Segment::SegGrace;
// st = Segment::SegGrace;
}
else {
if (durationType.type() == TDuration::V_INVALID)

2
mscore/inspectorHairpin.cpp
View file

@ -44,6 +44,8 @@ void InspectorHairpin::setElement(Element* e)
iHairpin.subtype->blockSignals(true);
iHairpin.subtype->setCurrentIndex(int(hairpin->subtype()));
iHairpin.subtype->blockSignals(false);
iHairpin.dynType->setCurrentIndex(int(hairpin->dynType()));
iHairpin.veloChange->setValue(hairpin->veloChange());
}
//---------------------------------------------------------

80
mscore/inspector_hairpin.ui
View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>287</width>
<height>68</height>
<height>125</height>
</rect>
</property>
<property name="windowTitle">
@ -45,13 +45,6 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Subtype:</string>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="subtype">
<item>
@ -66,6 +59,77 @@
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Subtype:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Dynamic Type:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Velo. change:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="dynType">
<item>
<property name="text">
<string>Staff</string>
</property>
</item>
<item>
<property name="text">
<string>Part</string>
</property>
</item>
<item>
<property name="text">
<string>SYstem</string>
</property>
</item>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="veloChange"/>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="resetDynType">
<property name="toolTip">
<string>reset value</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons-dark/resetproperty.png</normaloff>:/data/icons-dark/resetproperty.png</iconset>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QToolButton" name="resetVeloChange">
<property name="toolTip">
<string>reset value</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="musescore.qrc">
<normaloff>:/data/icons-dark/resetproperty.png</normaloff>:/data/icons-dark/resetproperty.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>