From: werner s. <wsc...@us...> - 2006-01-08 14:08:07
|
Update of /cvsroot/lmuse/muse/muse/midiedit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19855/muse/midiedit Modified Files: ctrledit.cpp ecanvas.cpp ecanvas.h Log Message: drumeditor fixes Index: ctrledit.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ctrledit.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ctrledit.cpp 29 Nov 2005 20:49:13 -0000 1.3 --- ctrledit.cpp 8 Jan 2006 14:07:48 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- { _track = t; + _ctrlTrack = t; y = 0; _height = 0; *************** *** 105,108 **** --- 106,110 ---- _ctrlTrack = _track; } + _tc->updateCanvasB(); } Index: ecanvas.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ecanvas.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ecanvas.h 7 Jan 2006 16:29:13 -0000 1.29 --- ecanvas.h 8 Jan 2006 14:07:48 -0000 1.30 *************** *** 75,78 **** --- 75,79 ---- virtual void mousePress(QMouseEvent*); + virtual void mouseDoubleClick(QMouseEvent*); virtual void mouseMove(QPoint); virtual void enterB(); Index: ecanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/midiedit/ecanvas.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** ecanvas.cpp 7 Jan 2006 16:29:13 -0000 1.46 --- ecanvas.cpp 8 Jan 2006 14:07:48 -0000 1.47 *************** *** 46,51 **** setMouseTracking(true); ! curPart = (MidiPart*)(editor->parts()->begin()->second); ! curPartId = curPart->sn(); } --- 46,58 ---- setMouseTracking(true); ! if (editor->parts()->empty()) { ! curPart = 0; ! printf("no cur part!\n"); ! } ! else { ! curPart = (MidiPart*)(editor->parts()->begin()->second); ! printf("curPart %p\n", curPart); ! curPartId = curPart->sn(); ! } } *************** *** 868,871 **** --- 875,879 ---- { int n = ctrlEditList.size(); + printf("new controller %p\n", track()); CtrlEdit* ce = new CtrlEdit(widget(), this, track()); ctrlEditList.push_back(ce); *************** *** 1057,1060 **** --- 1065,1077 ---- //--------------------------------------------------------- + // mouseDoubleClick + //--------------------------------------------------------- + + void EventCanvas::mouseDoubleClick(QMouseEvent* me) + { + mousePress(me); + } + + //--------------------------------------------------------- // mousePress //--------------------------------------------------------- |