diff options
| author | Tim E. Real <termtech@rogers.com> | 2013-02-20 01:16:45 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2013-02-20 01:16:45 +0000 |
| commit | c3650bf9b2302e1a20853f0cadc7833370e3d0dd (patch) | |
| tree | fa1a229b0928290a00f974a14104e385d42c5905 /muse2/muse/ctrl/ctrlcanvas.h | |
| parent | 612acc2cd3979edf441d2f33403f6b3403c1cf05 (diff) | |
MASSIVE FIXES: MANY editor, usability, operation fixes and changes.
See ChangeLog.
Diffstat (limited to 'muse2/muse/ctrl/ctrlcanvas.h')
| -rw-r--r-- | muse2/muse/ctrl/ctrlcanvas.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h index d1ee2e04..df52cfd7 100644 --- a/muse2/muse/ctrl/ctrlcanvas.h +++ b/muse2/muse/ctrl/ctrlcanvas.h @@ -32,6 +32,7 @@ #include "midictrl.h" #include "event.h" +class QWheelEvent; class QMouseEvent; class QEvent; class QWidget; @@ -118,6 +119,7 @@ class CtrlCanvas : public MusEGui::View { void viewMousePressEvent(QMouseEvent* event); void viewMouseMoveEvent(QMouseEvent*); void viewMouseReleaseEvent(QMouseEvent*); + virtual void wheelEvent(QWheelEvent*); virtual void draw(QPainter&, const QRect&); virtual void pdraw(QPainter&, const QRect&); @@ -155,6 +157,7 @@ class CtrlCanvas : public MusEGui::View { MusEGui::Tool tool; unsigned pos[3]; int curDrumPitch; //Used by the drum-editor to view velocity of only one key (one drum) + bool _perNoteVeloMode; void leaveEvent(QEvent*e); QPoint raster(const QPoint&) const; @@ -184,16 +187,19 @@ class CtrlCanvas : public MusEGui::View { void followEvent(int); void xposChanged(unsigned); void yposChanged(int); + void redirectWheelEvent(QWheelEvent*); public: CtrlCanvas(MidiEditor*, QWidget* parent, int, const char* name = 0, CtrlPanel* pnl = 0); ~CtrlCanvas(); - void setPanel(CtrlPanel* pnl) { _panel = pnl; } + void setPanel(CtrlPanel* pnl); MusECore::MidiCtrlValList* ctrlValList() { return ctrl; } MusECore::MidiController* controller() { return _controller; } MusECore::MidiTrack* track() const { return curTrack; } int getCurDrumPitch() const { return curDrumPitch; } + bool perNoteVeloMode() const { return _perNoteVeloMode; } + void setPerNoteVeloMode(bool); }; } // namespace MusEGui |