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

update debugger

Browse source
This commit is contained in:
ws 2014-06-17 15:34:11 +02:00
parent e593c861f7
commit a77497571b
5 changed files with 12 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmscore/segment.cpp
View file

@ -51,8 +51,10 @@ const char* Segment::subTypeName() const
const char* Segment::subTypeName(SegmentType t)
{
switch(t) {
case SegmentType::Invalid: return "Invalid";
case SegmentType::Clef: return "Clef";
case SegmentType::KeySig: return "Key Signature";
case SegmentType::Ambitus: return "Ambitus";
case SegmentType::TimeSig: return "Time Signature";
case SegmentType::StartRepeatBarLine: return "Begin Repeat";
case SegmentType::BarLine: return "BarLine";
@ -62,7 +64,7 @@ const char* Segment::subTypeName(SegmentType t)
case SegmentType::TimeSigAnnounce: return "Time Sig Precaution";
case SegmentType::KeySigAnnounce: return "Key Sig Precaution";
default:
return "";
return "??";
}
}

26
mscore/debugger/debugger.cpp
View file

@ -89,14 +89,14 @@ class ElementItem : public QTreeWidgetItem
};
ElementItem::ElementItem(QTreeWidget* lv, Element* e)
: QTreeWidgetItem(lv, int(e->type()))
: QTreeWidgetItem(lv, int(e->type()) + int(QTreeWidgetItem::UserType))
{
el = e;
init();
}
ElementItem::ElementItem(QTreeWidgetItem* ei, Element* e)
: QTreeWidgetItem(ei, int(e->type()))
: QTreeWidgetItem(ei, int(e->type()) + int(QTreeWidgetItem::UserType))
{
el = e;
init();
@ -144,9 +144,7 @@ Debugger::Debugger(QWidget* parent)
for (int i = 0; i < int(ElementType::MAXTYPE); ++i)
elementViews[i] = 0;
curElement = 0;
// connect(tupletView, SIGNAL(scoreChanged()), SLOT(layoutScore()));
// connect(notePanel, SIGNAL(scoreChanged()), SLOT(layoutScore()));
cs = 0;
connect(list, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SLOT(itemClicked(QTreeWidgetItem*,int)));
connect(list, SIGNAL(itemExpanded(QTreeWidgetItem*)), SLOT(itemExpanded(QTreeWidgetItem*)));
@ -568,7 +566,9 @@ void Debugger::updateElement(Element* el)
qDebug("Debugger::Element not found %s %p", el->name(), el);
break;
}
ElementItem* ei = (ElementItem*)item;
if (item->type() == QTreeWidgetItem::Type)
continue;
ElementItem* ei = static_cast<ElementItem*>(item);
if (ei->element() == el) {
list->setItemExpanded(item, true);
list->setCurrentItem(item);
@ -1768,20 +1768,6 @@ void ShowElementBase::setElement(Element* e)
eb.readPosY->setValue(e->readPos().y());
eb.placement->setCurrentIndex(int(e->placement()));
#if 0
Align a = e->align();
QString s;
s += a & ALIGN_LEFT ? "L" : "-";
s += a & ALIGN_HCENTER ? "C" : "-";
s += a & ALIGN_RIGHT ? "R" : "-";
s += " ";
s += a & ALIGN_TOP ? "T" : "-";
s += a & ALIGN_VCENTER ? "C" : "-";
s += a & ALIGN_BOTTOM ? "B" : "-";
s += a & ALIGN_BASELINE ? "L" : "-";
eb.alignment->setText(s);
#endif
eb.bboxx->setValue(e->bbox().x());
eb.bboxy->setValue(e->bbox().y());
eb.bboxw->setValue(e->bbox().width());

1
mscore/debugger/debugger.h
View file

@ -84,7 +84,6 @@ class Debugger : public QDialog, public Ui::DebuggerBase {
ShowElementBase* elementViews[int(ElementType::MAXTYPE)];
bool searchElement(QTreeWidgetItem* pi, Element* el);
// void addSymbol(ElementItem* parent, BSymbol* bs);
void updateElement(Element*);
virtual void showEvent(QShowEvent*);
void addMeasure(ElementItem* mi, Measure* measure);

54
mscore/debugger/element.ui
View file

@ -307,56 +307,6 @@
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string notr="true"/>
</property>
<property name="accessibleDescription">
<string notr="true"/>
</property>
<property name="text">
<string notr="true" comment="do not translate">subtype</string>
</property>
<property name="alignment">
<set>Qt::AlignRight</set>
</property>
<property name="indent">
<number>5</number>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QSpinBox" name="subtype">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string notr="true"/>
</property>
<property name="accessibleDescription">
<string notr="true"/>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
</property>
<property name="maximum">
<number>999999999</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="selectable">
<property name="toolTip">
@ -457,7 +407,7 @@
</item>
</layout>
</item>
<item row="0" column="6">
<item row="0" column="4">
<widget class="QLabel" name="label">
<property name="text">
<string notr="true">placement</string>
@ -467,7 +417,7 @@
</property>
</widget>
</item>
<item row="0" column="7">
<item row="0" column="5">
<widget class="QComboBox" name="placement">
<property name="accessibleDescription">
<string notr="true"/>

1
mscore/palette.cpp
View file

@ -74,6 +74,7 @@ Palette::Palette(QWidget* parent)
{
extraMag = 1.0;
currentIdx = -1;
dragIdx = -1;
selectedIdx = -1;
_yOffset = 0.0;
setGrid(50, 60);