Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/midiedit ctrledit.cpp,1.4,1.5 ctrledit.h,1.4,1.5 dcanvas.cpp,1.51,1.52 ecanvas.cpp,1.47,1.48 prcanvas.cpp,1.62,1.63
|
From: werner s. <wsc...@us...> - 2006-01-08 19:38:22
|
Update of /cvsroot/lmuse/muse/muse/midiedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26216/muse/midiedit Modified Files: ctrledit.cpp ctrledit.h dcanvas.cpp ecanvas.cpp prcanvas.cpp Log Message: misc fixes Index: dcanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/dcanvas.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** dcanvas.cpp 8 Jan 2006 15:11:20 -0000 1.51 --- dcanvas.cpp 8 Jan 2006 19:38:13 -0000 1.52 *************** *** 63,66 **** --- 63,67 ---- canvasTools = PointerTool | PencilTool | RubberTool; songChanged(SC_TRACK_INSERTED); + connect(track(), SIGNAL(drumMapChanged()), widget(), SLOT(update())); } *************** *** 174,178 **** CItem* DrumCanvas::newItem(const QPoint& p, int state) { ! int pitch = y2pitch(p.y()); int instr = drumMap()->outmap(pitch); DrumMapEntry* dm = drumMap()->entry(instr); --- 175,180 ---- CItem* DrumCanvas::newItem(const QPoint& p, int state) { ! int y = p.y(); ! int pitch = y2pitch(y); int instr = drumMap()->outmap(pitch); DrumMapEntry* dm = drumMap()->entry(instr); *************** *** 729,733 **** p.setPen(QPen(Qt::black, 1)); ! int yoff = wpos.y() - rulerHeight; int i = (r.y() + yoff) / drumHeight; if (i < 0) --- 731,735 ---- p.setPen(QPen(Qt::black, 1)); ! int yoff = wpos.y() - rPanelA.y(); int i = (r.y() + yoff) / drumHeight; if (i < 0) *************** *** 739,744 **** for (; i < 128; ++i, y += drumHeight) { QRect r(3, y, drumWidth-4, drumHeight); ! if (dm->anote(i) == curPitch) p.fillRect(0, y, drumWidth-4, drumHeight, Qt::white); DrumMapEntry* de = dm->entry(i); p.drawText(r, Qt::AlignVCenter | Qt::AlignLeft, de->name); --- 741,747 ---- for (; i < 128; ++i, y += drumHeight) { QRect r(3, y, drumWidth-4, drumHeight); ! if (dm->anote(i) == curPitch) { p.fillRect(0, y, drumWidth-4, drumHeight, Qt::white); + } DrumMapEntry* de = dm->entry(i); p.drawText(r, Qt::AlignVCenter | Qt::AlignLeft, de->name); *************** *** 779,784 **** iCItem from(items.lower_bound(p1.tick())); iCItem to(items.upper_bound(p2.tick())); ! int pitch1 = y2pitch(lasso.y()); ! int pitch2 = y2pitch(lasso.y() + lasso.height()); int n = 0; --- 782,788 ---- iCItem from(items.lower_bound(p1.tick())); iCItem to(items.upper_bound(p2.tick())); ! int y = lasso.y(); ! int pitch1 = y2pitch(y); ! int pitch2 = y2pitch(y + lasso.height()); int n = 0; Index: prcanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/prcanvas.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** prcanvas.cpp 7 Jan 2006 16:29:13 -0000 1.62 --- prcanvas.cpp 8 Jan 2006 19:38:13 -0000 1.63 *************** *** 45,49 **** { CItem* item = new CItem(event, part); ! int y = pitch2y(event.pitch()) + keyHeight/4; item->pos = event.pos() + *part; unsigned time = item->pos.time(timeType()); --- 45,49 ---- { CItem* item = new CItem(event, part); ! int y = pitch2y(event.pitch()) + keyHeight/4 + wpos.y(); item->pos = event.pos() + *part; unsigned time = item->pos.time(timeType()); *************** *** 192,196 **** Part* part = item->part; Event event = item->event; ! int npitch = y2pitch(item->my); if (event.pitch() != npitch && _playEvents) { --- 192,196 ---- Part* part = item->part; Event event = item->event; ! int npitch = y2pitch(item->my - wpos.y()); if (event.pitch() != npitch && _playEvents) { *************** *** 218,223 **** CItem* PianoCanvas::newItem(const QPoint& p, int) { ! int y = lrint((p.y() + wpos.y())/_ymag); ! int pitch = y2pitch(y); Pos opos(pix2pos(p.x())); Pos pos(opos); --- 218,222 ---- CItem* PianoCanvas::newItem(const QPoint& p, int) { ! int pitch = y2pitch(p.y()); Pos opos(pix2pos(p.x())); Pos pos(opos); *************** *** 233,237 **** int l = timeType() == AL::TICKS ? e.lenTick() : e.lenFrame(); int x = pos.time(timeType()); ! y = pitch2y(pitch) + keyHeight/4; // i->bbox = QRect(x, y, l, keyHeight/2); i->bbox = QRect(x, y, l, keyHeight/2); --- 232,236 ---- int l = timeType() == AL::TICKS ? e.lenTick() : e.lenFrame(); int x = pos.time(timeType()); ! int y = pitch2y(pitch) + keyHeight/4 + wpos.y(); // i->bbox = QRect(x, y, l, keyHeight/2); i->bbox = QRect(x, y, l, keyHeight/2); *************** *** 922,926 **** void PianoCanvas::itemMoved(const CItem* item) { ! int npitch = y2pitch(item->my); if ((playedPitch != -1) && (playedPitch != npitch)) { Event event = item->event; --- 921,925 ---- void PianoCanvas::itemMoved(const CItem* item) { ! int npitch = y2pitch(item->my + wpos.y()); if ((playedPitch != -1) && (playedPitch != npitch)) { Event event = item->event; Index: ctrledit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ctrledit.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ctrledit.cpp 8 Jan 2006 14:07:48 -0000 1.4 --- ctrledit.cpp 8 Jan 2006 19:38:13 -0000 1.5 *************** *** 28,37 **** CtrlEdit::CtrlEdit(QWidget* parent, TimeCanvas* timeCanvas, Track* t) ! : QObject(parent) { - _track = t; _ctrlTrack = t; y = 0; ! _height = 0; _drawCtrlName = true; --- 28,36 ---- CtrlEdit::CtrlEdit(QWidget* parent, TimeCanvas* timeCanvas, Track* t) ! : _track(t), QObject(parent) { _ctrlTrack = t; y = 0; ! _height = 0; _drawCtrlName = true; *************** *** 40,44 **** ctrlId = CTRL_VELOCITY; ! connect(track(), SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int))); sel = new SimpleButton(QString("Sel"), parent); --- 39,43 ---- ctrlId = CTRL_VELOCITY; ! connect(_track, SIGNAL(controllerChanged(int)), SLOT(controllerListChanged(int))); sel = new SimpleButton(QString("Sel"), parent); Index: ctrledit.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ctrledit.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ctrledit.h 12 Dec 2005 22:03:44 -0000 1.4 --- ctrledit.h 8 Jan 2006 19:38:13 -0000 1.5 *************** *** 22,26 **** Q_OBJECT ! Track* _track; Track* _ctrlTrack; Ctrl* _ctrl; --- 22,26 ---- Q_OBJECT ! Track* const _track; Track* _ctrlTrack; Ctrl* _ctrl; Index: ecanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ecanvas.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** ecanvas.cpp 8 Jan 2006 14:07:48 -0000 1.47 --- ecanvas.cpp 8 Jan 2006 19:38:13 -0000 1.48 *************** *** 52,56 **** else { curPart = (MidiPart*)(editor->parts()->begin()->second); - printf("curPart %p\n", curPart); curPartId = curPart->sn(); } --- 52,55 ---- *************** *** 801,808 **** int ny = pitch2y(y2pitch(pitch2y(item->event.pitch()) + dy)); ! if (item->moving != p || item->my != ny) { item->moving = p; if (dir != 1) ! item->my = ny; itemMoved(item); } --- 800,807 ---- int ny = pitch2y(y2pitch(pitch2y(item->event.pitch()) + dy)); ! if (item->moving != p || (item->my - wpos.y()) != ny) { item->moving = p; if (dir != 1) ! item->my = ny + wpos.y(); itemMoved(item); } *************** *** 875,879 **** { int n = ctrlEditList.size(); - printf("new controller %p\n", track()); CtrlEdit* ce = new CtrlEdit(widget(), this, track()); ctrlEditList.push_back(ce); --- 874,877 ---- *************** *** 966,970 **** { int id = a->data().toInt(); - printf("removeController %d\n", id); int k = 0; --- 964,967 ---- *************** *** 1121,1125 **** { if (rPanelA.contains(pos) || rCanvasA.contains(pos)) { ! int y = lrint((pos.y() + wpos.y() - rCanvasA.y()) / _ymag); int pitch = y2pitch(y); if (curPitch != pitch) { --- 1118,1122 ---- { if (rPanelA.contains(pos) || rCanvasA.contains(pos)) { ! int y = pos.y() - rCanvasA.y(); int pitch = y2pitch(y); if (curPitch != pitch) { *************** *** 1128,1137 **** emit pitchChanged(curPitch); if (button != Qt::NoButton) { ! if (curPitch != -1) { bool shift = keyState & Qt::ShiftModifier; if (curPitch != keyDown) ! pianoReleased(keyDown, shift); keyDown = curPitch; ! pianoPressed(keyDown, 100, shift); } } --- 1125,1134 ---- emit pitchChanged(curPitch); if (button != Qt::NoButton) { ! if (keyDown != -1 && curPitch != -1) { bool shift = keyState & Qt::ShiftModifier; if (curPitch != keyDown) ! noteOff(keyDown, shift); keyDown = curPitch; ! noteOn(keyDown, 100, shift); } } |