From 5b26094ecf066577cd1e45b5a21136a4cece942a Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Sun, 27 Mar 2011 21:12:41 +0000 Subject: More controller graph, and midi track info fixes. --- muse2/ChangeLog | 3 + muse2/muse/ctrl/ctrlcanvas.cpp | 1 + muse2/muse/widgets/mtrackinfobase.ui | 1602 ++++++++++++++++------------------ 3 files changed, 777 insertions(+), 829 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 04148878..af58b770 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,6 @@ +27.03.2011: + - Fixed end/off-screen selections not being drawn in midi controller graphs. (Tim) + - Reverted Midi Track Info ui layout more or less to pre- Mar 5, with some improvements. (Tim) 24.03.2011: - Fixed: Problems with midi event list editor. (p4.0.18 Tim) For ex. problems selecting items while pianroll open. Changed ListEdit::songChanged(). diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp index 172911de..0b50b3ef 100644 --- a/muse2/muse/ctrl/ctrlcanvas.cpp +++ b/muse2/muse/ctrl/ctrlcanvas.cpp @@ -2018,6 +2018,7 @@ void CtrlCanvas::pdrawItems(QPainter& p, const QRect& rect, const MidiPart* part else lval = wh - ((val - min - bias) * wh / (max - min)); } + selected = e->selected(); continue; } if (tick > x+w) diff --git a/muse2/muse/widgets/mtrackinfobase.ui b/muse2/muse/widgets/mtrackinfobase.ui index 0ecf7c10..53e772c8 100644 --- a/muse2/muse/widgets/mtrackinfobase.ui +++ b/muse2/muse/widgets/mtrackinfobase.ui @@ -6,8 +6,8 @@ 0 0 - 96 - 588 + 98 + 447 @@ -43,485 +43,157 @@ - - + + + 1 + + + 0 + + + 1 + + 0 - + 0 - - + + + + + 0 + 0 + + + + true + + + + + + + + 0 + 0 + + + + output port + + + + + + + + 0 + 0 + + + + output channel + + + all midi events are sent to this output channel + + + false + + + 1 + + + 16 + + + + + + + + 0 + 0 + + + + Out ch + + + false + + + 0 + + + 1 + + + + + 0 - + - + 0 0 - - true + + input routing + + + iR - + - + 0 0 - output port + output routing + + + oR + + + + + + 0 + - - - 0 - - - - - - 0 - 0 - - - - output channel - - - all midi events are sent to this output channel - - - false - - - 1 - - - 16 - - - - - - - - 0 - 0 - - - - Out ch - - - false - - - 0 - - - 1 - - - - - - - - - 0 - - - - - - 0 - 0 - - - - input routing - - - iR - - - - - - - - 0 - 0 - - - - output routing - - - oR - - - - - - - - 0 - 0 - - - - input detect - - - Input detect indicator. Detects all note on-off, controller, aftertouch, - program change, and pitchbend (but not sysex or realtime) events - on the selected channels, on the selected midi ports. - - - W - - - Qt::AlignCenter - - - false - - - 2 - - - -1 - - - - - - - - 0 - 0 - - - - Midi thru - - - Pass input events through ('thru') to output. - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 13 - 13 - - - - - - - - - - 0 - - - - - - 0 - 0 - - - - false - - - off - - - -127 - - - 127 - - - 1 - - - - - - - - 0 - 0 - - - - Transp. - - - false - - - 2 - - - - - - - - - 0 - - - - - - 0 - 0 - - - - false - - - off - - - -1000 - - - 1000 - - - - - - - - 0 - 0 - - - - Delay - - - false - - - 2 - - - - - - - - - 0 - - - - - - 0 - 0 - - - - false - - - % - - - 25 - - - 200 - - - 100 - - - - - - - - 0 - 0 - - - - Length - - - false - - - 2 - - - - - - - - - 0 - - - - - - 0 - 0 - - - - - 8 - 5 - - - - false - - - -127 - - - 127 - - - 0 - - - - - - - - 0 - 0 - - - - Velocity - - - false - - - 0 - - - - - - - - - 0 - - - - - - 0 - 0 - - - - false - - - % - - - - - - 25 - - - 200 - - - 100 - - - - - - - - 0 - 0 - - - - Compr. - - - false - - - 2 - - - - - - - + - + 0 0 - - QFrame::WinPanel - - - QFrame::Raised - - - 1 + + input detect - - 1 + + Input detect indicator. Detects all note on-off, controller, aftertouch, + program change, and pitchbend (but not sysex or realtime) events + on the selected channels, on the selected midi ports. - Channel Info + W Qt::AlignCenter @@ -529,426 +201,682 @@ false + + 2 + + + -1 + + + + + + + + 0 + 0 + + + + Midi thru + + + Pass input events through ('thru') to output. + + + true + - + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 13 + 13 + + + + + + + + + + + 0 + 0 + + + + false + + + off + + + -127 + + + 127 + + + 1 + + + + + + + + 0 + 0 + + + + Transp. + + + false + + + 2 + + + + + + + + 0 + 0 + + + + false + + + off + + + -1000 + + + 1000 + + + + + + + + 0 + 0 + + + + Delay + + + false + + + 2 + + + + + + + + 0 + 0 + + + + false + + + % + + + 25 + + + 200 + + + 100 + + + + + + + + 0 + 0 + + + + Length + + + false + + + 2 + + + + + + + + 0 + 0 + + + + + 8 + 5 + + + + false + + + -127 + + + 127 + + + 0 + + + + + + + + 0 + 0 + + + + Velocity + + + false + + + 0 + + + + + + + + 0 + 0 + + + + false + + + % + + + + + + 25 + + + 200 + + + 100 + + + + + + + + 0 + 0 + + + + Compr. + + + false + + + 2 + + + + + + + + 0 + 0 + + + + QFrame::WinPanel + + + QFrame::Raised + + + 1 + + + 1 + + + Channel Info + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 + + + + Select instrument patch + + + <unknown> + + + + + + + + 0 + 0 + + + + Rec: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + 0 + + + - + 0 0 - Select instrument patch + Add all settings to song - <unknown> + All - - - 0 - - - - - - 0 - 0 - - - - Rec: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - 0 - 0 - - - - Add all settings to song - - - All - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 2 - 2 - - - - - + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 13 + 13 + + + + + + + + + + 0 + 0 + + + + Bank Select MSB. Double-click on/off. + + + false + + + off + + + 0 + + + 128 + + + 0 + + + + + + + + 0 + 0 + + + + 1 + + + H-Bank + + + false + + + 0 + + + 2 + + + + + + + + 0 + 0 + + + + Bank Select LSB. Double-click on/off. + + + false + + + off + + + 0 + + + 128 + + + 0 + + + + + + + + 0 + 0 + + + + 1 + + + L-Bank + + + false + + + 0 + + + 2 + + + + + + + + 0 + 0 + + + + Program. Double-click on/off. + + + false + + + off + + + 0 + + + 128 + + + 0 + + + + + + + 0 + - - - 0 - - - - - - 0 - 0 - - - - Bank Select MSB. Double-click on/off. - - - false - - - off - - - 0 - - - 128 - - - 0 - - - - - - - - 0 - 0 - - - - 1 - - - H-Bank - - - false - - - 0 - - - 2 - - - - + + + + 0 + 0 + + + + Add bank + prog settings to song + + + Prog + + - - - 0 - - - - - - 0 - 0 - - - - Bank Select LSB. Double-click on/off. - - - false - - - off - - - 0 - - - 128 - - - 0 - - - - - - - - 0 - 0 - - - - 1 - - - L-Bank - - - false - - - 0 - - - 2 - - - - + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 13 + 13 + + + + + + + + + + 0 + 0 + + + + Volume. Double-click on/off. + + + false + + + off + + + -1 + + + 127 + + + -1 + + + + + + + 0 + - - - 0 + + + + 0 + 0 + - - 0 - - - - - - 0 - 0 - - - - Program. Double-click on/off. - - - false - - - off - - - 0 - - - 128 - - - 0 - - - - - - - - 0 - 0 - - - - Add bank + prog settings to song - - - Prog - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 2 - 2 - - - - - + + Add vol setting to song + + + Vol + + - - - 0 + + + Qt::Horizontal - - 0 - - - - - - 0 - 0 - - - - Volume. Double-click on/off. - - - false - - - off - - - -1 - - - 127 - - - -1 - - - - - - - - 0 - 0 - - - - Add vol setting to song - - - Vol - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 2 - 2 - - - - - + + QSizePolicy::Expanding + + + + 13 + 13 + + + + + + + + + + 0 + 0 + + + + Change stereo position. Double-click on/off. + + + Change stereo position. Double-click on/off. + + + false + + + off + + + -65 + + + 63 + + + -65 + + + + + + + 0 + - - - 0 + + + + 0 + 0 + - - 0 - - - - - - 0 - 0 - - - - Change stereo position. Double-click on/off. - - - Change stereo position. Double-click on/off. - - - false - - - off - - - -65 - - - 63 - - - -65 - - - - - - - - 0 - 0 - - - - Add pan setting to song - - - Pan - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 2 - 2 - - - - - + + Add pan setting to song + + + Pan + + - + - Qt::Vertical + Qt::Horizontal QSizePolicy::Expanding - 18 + 13 13 @@ -956,6 +884,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 18 + 58 + + + + -- cgit v1.2.3